Revision: 55535
http://sourceforge.net/p/brlcad/code/55535
Author: brlcad
Date: 2013-05-22 17:51:53 +0000 (Wed, 22 May 2013)
Log Message:
-----------
walls of code are bad... clean up and document the pkgIndex.tcl and tclIndex
macros. eliminated the name argument since we can generate it automatically
off of the path.
Modified Paths:
--------------
brlcad/trunk/src/tclscripts/CMakeLists.txt
brlcad/trunk/src/tclscripts/archer/CMakeLists.txt
brlcad/trunk/src/tclscripts/boteditor/CMakeLists.txt
brlcad/trunk/src/tclscripts/geometree/CMakeLists.txt
brlcad/trunk/src/tclscripts/hv3/CMakeLists.txt
brlcad/trunk/src/tclscripts/igraph/CMakeLists.txt
brlcad/trunk/src/tclscripts/lib/CMakeLists.txt
brlcad/trunk/src/tclscripts/lod/CMakeLists.txt
brlcad/trunk/src/tclscripts/mged/CMakeLists.txt
brlcad/trunk/src/tclscripts/pl-dm/CMakeLists.txt
brlcad/trunk/src/tclscripts/rtwizard/CMakeLists.txt
brlcad/trunk/src/tclscripts/rtwizard/lib/CMakeLists.txt
brlcad/trunk/src/tclscripts/sdialogs/CMakeLists.txt
brlcad/trunk/src/tclscripts/sdialogs/scripts/CMakeLists.txt
brlcad/trunk/src/tclscripts/swidgets/CMakeLists.txt
brlcad/trunk/src/tclscripts/swidgets/scripts/CMakeLists.txt
brlcad/trunk/src/tclscripts/util/CMakeLists.txt
Modified: brlcad/trunk/src/tclscripts/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/CMakeLists.txt 2013-05-22 16:33:35 UTC (rev
55534)
+++ brlcad/trunk/src/tclscripts/CMakeLists.txt 2013-05-22 17:51:53 UTC (rev
55535)
@@ -1,48 +1,76 @@
-# Convenience macros for building pkgIndex.tcl and tclIndex files
+###
+# Convenience macro for building pkgIndex.tcl
+###
+MACRO(pkgIndex_BUILD targetdir)
+ # normalize so we can use it as a name
+ string(REGEX REPLACE "/" "_" name ${targetdir})
-MACRO(pkgIndex_BUILD name targetdir)
- BRLCAD_GET_DIR_LIST_CONTENTS(DATA_TARGETS "${CMAKE_CURRENT_BINARY_DIR}"
data_target_list)
- string(REGEX REPLACE "/" "_" targetprefix ${targetdir})
+ # divert output to diff paths depending on whether debug or release
if(CMAKE_CONFIGURATION_TYPES)
set(pkgIndex_outdir
"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${DATA_DIR}/${targetdir}")
else(CMAKE_CONFIGURATION_TYPES)
set(pkgIndex_outdir "${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}")
endif(CMAKE_CONFIGURATION_TYPES)
+
+ # get file list so we can make pkgIndex.tcl depend on them
+ BRLCAD_GET_DIR_LIST_CONTENTS(DATA_TARGETS "${CMAKE_CURRENT_BINARY_DIR}"
data_target_list)
+
+ # command that builds the index when the dependency is resolved
add_custom_command(
OUTPUT ${pkgIndex_outdir}/pkgIndex.tcl
COMMAND btclsh ${CMAKE_SOURCE_DIR}/src/tclscripts/ampi.tcl
${pkgIndex_outdir}
DEPENDS btclsh ${data_target_list}
)
+
+ # put pkgIndex.tcl where it goes
install(FILES ${pkgIndex_outdir}/pkgIndex.tcl DESTINATION
${DATA_DIR}/${targetdir})
+
+ # convenience target
add_custom_target(${name}_pkgIndex.tcl ALL DEPENDS
${pkgIndex_outdir}/pkgIndex.tcl)
+
# Maintain a list of all pkgIndex targets for dependency purposes
set(pkgIndex_target_list ${pkgIndex_target_list} ${name}_pkgIndex.tcl)
list(REMOVE_DUPLICATES pkgIndex_target_list)
set(pkgIndex_target_list "${pkgIndex_target_list}" CACHE STRING "pkgIndex
target list" FORCE)
ENDMACRO(pkgIndex_BUILD name targetdir)
+mark_as_advanced(pkgIndex_target_list)
-MACRO(tclIndex_BUILD name targetdir)
- BRLCAD_GET_DIR_LIST_CONTENTS(DATA_TARGETS "${CMAKE_CURRENT_BINARY_DIR}"
data_target_list)
- string(REGEX REPLACE "/" "_" targetprefix ${targetdir})
+
+###
+# Convenience macro for building tclIndex
+###
+MACRO(tclIndex_BUILD targetdir)
+ # normalize so we can use it as a name
+ string(REGEX REPLACE "/" "_" name ${targetdir})
+
+ # divert output to diff paths depending on whether debug or release
if(CMAKE_CONFIGURATION_TYPES)
set(tclIndex_outdir
"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${DATA_DIR}/${targetdir}")
else(CMAKE_CONFIGURATION_TYPES)
set(tclIndex_outdir "${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}")
endif(CMAKE_CONFIGURATION_TYPES)
+
+ # get file list so we can make tclIndex depend on them
+ BRLCAD_GET_DIR_LIST_CONTENTS(DATA_TARGETS "${CMAKE_CURRENT_BINARY_DIR}"
data_target_list)
+
+ # command that builds the index when the dependency is resolved
add_custom_command(
OUTPUT ${tclIndex_outdir}/tclIndex
COMMAND btclsh ${CMAKE_SOURCE_DIR}/src/tclscripts/ami.tcl
${tclIndex_outdir}
DEPENDS btclsh ${data_target_list}
)
+
+ # put tclIndex where it goes
install(FILES ${tclIndex_outdir}/tclIndex DESTINATION
${DATA_DIR}/${targetdir})
+
+ # convenience target
add_custom_target(${name}_tclIndex ALL DEPENDS ${tclIndex_outdir}/tclIndex)
+
# Maintain a list of all tclIndex targets for dependency purposes
set(tclIndex_target_list ${tclIndex_target_list} ${name}_tclIndex)
list(REMOVE_DUPLICATES tclIndex_target_list)
set(tclIndex_target_list "${tclIndex_target_list}" CACHE STRING "tclIndex
target list" FORCE)
ENDMACRO(tclIndex_BUILD name targetdir)
-
-mark_as_advanced(pkgIndex_target_list)
mark_as_advanced(tclIndex_target_list)
@@ -79,8 +107,8 @@
vmath.tcl
)
BRLCAD_ADDDATA(tclscripts_TCLSCRIPTS tclscripts)
-pkgIndex_BUILD(tclscripts tclscripts)
-tclIndex_BUILD(tclscripts tclscripts)
+pkgIndex_BUILD(tclscripts)
+tclIndex_BUILD(tclscripts)
CMAKEFILES(README Makefile.am pkgIndex.tcl tclIndex hv3_man_browser_test.tcl)
Modified: brlcad/trunk/src/tclscripts/archer/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/archer/CMakeLists.txt 2013-05-22 16:33:35 UTC
(rev 55534)
+++ brlcad/trunk/src/tclscripts/archer/CMakeLists.txt 2013-05-22 17:51:53 UTC
(rev 55535)
@@ -43,8 +43,8 @@
tabwindow.itk
)
BRLCAD_ADDDATA(archer_TCLSCRIPTS tclscripts/archer)
-pkgIndex_BUILD(archer tclscripts/archer)
-tclIndex_BUILD(archer tclscripts/archer)
+pkgIndex_BUILD(tclscripts/archer)
+tclIndex_BUILD(tclscripts/archer)
CMAKEFILES(pkgIndex.tcl tclIndex)
CMAKEFILES(Makefile.am)
Modified: brlcad/trunk/src/tclscripts/boteditor/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/boteditor/CMakeLists.txt 2013-05-22
16:33:35 UTC (rev 55534)
+++ brlcad/trunk/src/tclscripts/boteditor/CMakeLists.txt 2013-05-22
17:51:53 UTC (rev 55535)
@@ -4,7 +4,7 @@
botTools.tcl
)
BRLCAD_ADDDATA(boteditor_TCLSCRIPTS tclscripts/boteditor)
-tclIndex_BUILD(boteditor tclscripts/boteditor)
+tclIndex_BUILD(tclscripts/boteditor)
CMAKEFILES(Makefile.am tclIndex)
Modified: brlcad/trunk/src/tclscripts/geometree/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/geometree/CMakeLists.txt 2013-05-22
16:33:35 UTC (rev 55534)
+++ brlcad/trunk/src/tclscripts/geometree/CMakeLists.txt 2013-05-22
17:51:53 UTC (rev 55535)
@@ -3,8 +3,8 @@
geometree.tcl
)
BRLCAD_ADDDATA(geometree_TCLSCRIPTS tclscripts/geometree)
-pkgIndex_BUILD(geometree tclscripts/geometree)
-tclIndex_BUILD(geometree tclscripts/geometree)
+pkgIndex_BUILD(tclscripts/geometree)
+tclIndex_BUILD(tclscripts/geometree)
CMAKEFILES(pkgIndex.tcl tclIndex)
CMAKEFILES(Makefile.am)
Modified: brlcad/trunk/src/tclscripts/hv3/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/hv3/CMakeLists.txt 2013-05-22 16:33:35 UTC
(rev 55534)
+++ brlcad/trunk/src/tclscripts/hv3/CMakeLists.txt 2013-05-22 17:51:53 UTC
(rev 55535)
@@ -8,8 +8,8 @@
snit.tcl
)
BRLCAD_ADDDATA(hv3_TCLSCRIPTS tclscripts/hv3)
-pkgIndex_BUILD(hv3 tclscripts/hv3)
-tclIndex_BUILD(hv3 tclscripts/hv3)
+pkgIndex_BUILD(tclscripts/hv3)
+tclIndex_BUILD(tclscripts/hv3)
install(FILES hv3.man DESTINATION ${DATA_DIR}/doc)
install(FILES tkhtml.n DESTINATION ${MAN_DIR}/mann)
set(hv3_ignore_files
Modified: brlcad/trunk/src/tclscripts/igraph/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/igraph/CMakeLists.txt 2013-05-22 16:33:35 UTC
(rev 55534)
+++ brlcad/trunk/src/tclscripts/igraph/CMakeLists.txt 2013-05-22 17:51:53 UTC
(rev 55535)
@@ -3,8 +3,8 @@
igraph.tcl
)
BRLCAD_ADDDATA(igraph_TCLSCRIPTS tclscripts/igraph)
-pkgIndex_BUILD(igraph tclscripts/igraph)
-tclIndex_BUILD(igraph tclscripts/igraph)
+pkgIndex_BUILD(tclscripts/igraph)
+tclIndex_BUILD(tclscripts/igraph)
CMAKEFILES(pkgIndex.tcl tclIndex)
CMAKEFILES(Makefile.am)
Modified: brlcad/trunk/src/tclscripts/lib/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/lib/CMakeLists.txt 2013-05-22 16:33:35 UTC
(rev 55534)
+++ brlcad/trunk/src/tclscripts/lib/CMakeLists.txt 2013-05-22 17:51:53 UTC
(rev 55535)
@@ -29,8 +29,8 @@
pattern_gui.tcl
)
BRLCAD_ADDDATA(lib_TCLSCRIPTS tclscripts/lib)
-pkgIndex_BUILD(lib tclscripts/lib)
-tclIndex_BUILD(lib tclscripts/lib)
+pkgIndex_BUILD(tclscripts/lib)
+tclIndex_BUILD(tclscripts/lib)
CMAKEFILES(pkgIndex.tcl tclIndex)
CMAKEFILES(Makefile.am)
Modified: brlcad/trunk/src/tclscripts/lod/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/lod/CMakeLists.txt 2013-05-22 16:33:35 UTC
(rev 55534)
+++ brlcad/trunk/src/tclscripts/lod/CMakeLists.txt 2013-05-22 17:51:53 UTC
(rev 55535)
@@ -2,7 +2,7 @@
LODDialog.tcl
)
BRLCAD_ADDDATA(lod_TCLSCRIPTS tclscripts/lod)
-tclIndex_BUILD(lod tclscripts/lod)
+tclIndex_BUILD(tclscripts/lod)
CMAKEFILES(Makefile.am tclIndex)
Modified: brlcad/trunk/src/tclscripts/mged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/mged/CMakeLists.txt 2013-05-22 16:33:35 UTC
(rev 55534)
+++ brlcad/trunk/src/tclscripts/mged/CMakeLists.txt 2013-05-22 17:51:53 UTC
(rev 55535)
@@ -84,8 +84,8 @@
)
BRLCAD_ADDDATA(mged_TCLSCRIPTS tclscripts/mged)
# no packages in here (so far)
-# pkgIndex_BUILD(mged tclscripts/mged)
-tclIndex_BUILD(mged tclscripts/mged)
+# pkgIndex_BUILD(tclscripts/mged)
+tclIndex_BUILD(tclscripts/mged)
set(mged_tcl_DATA
l_i0_v0_s0.gif
Modified: brlcad/trunk/src/tclscripts/pl-dm/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/pl-dm/CMakeLists.txt 2013-05-22 16:33:35 UTC
(rev 55534)
+++ brlcad/trunk/src/tclscripts/pl-dm/CMakeLists.txt 2013-05-22 17:51:53 UTC
(rev 55535)
@@ -4,8 +4,8 @@
menu.tcl
)
BRLCAD_ADDDATA(pl-dm_TCLSCRIPTS tclscripts/pl-dm)
-pkgIndex_BUILD(pl-dm tclscripts/pl-dm)
-tclIndex_BUILD(pl-dm tclscripts/pl-dm)
+pkgIndex_BUILD(tclscripts/pl-dm)
+tclIndex_BUILD(tclscripts/pl-dm)
CMAKEFILES(pkgIndex.tcl tclIndex)
CMAKEFILES(Makefile.am)
Modified: brlcad/trunk/src/tclscripts/rtwizard/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/rtwizard/CMakeLists.txt 2013-05-22 16:33:35 UTC
(rev 55534)
+++ brlcad/trunk/src/tclscripts/rtwizard/CMakeLists.txt 2013-05-22 17:51:53 UTC
(rev 55535)
@@ -45,8 +45,8 @@
rtwizard.bat
)
BRLCAD_ADDDATA(rtwizard_TCLSCRIPTS tclscripts/rtwizard)
-pkgIndex_BUILD(rtwizard tclscripts/rtwizard)
-tclIndex_BUILD(rtwizard tclscripts/rtwizard)
+pkgIndex_BUILD(tclscripts/rtwizard)
+tclIndex_BUILD(tclscripts/rtwizard)
# Examples
Modified: brlcad/trunk/src/tclscripts/rtwizard/lib/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/rtwizard/lib/CMakeLists.txt 2013-05-22
16:33:35 UTC (rev 55534)
+++ brlcad/trunk/src/tclscripts/rtwizard/lib/CMakeLists.txt 2013-05-22
17:51:53 UTC (rev 55535)
@@ -21,8 +21,8 @@
Wizard.itk
)
BRLCAD_ADDDATA(rtwizard_lib_TCLSCRIPTS tclscripts/rtwizard/lib)
-pkgIndex_BUILD(rtwizard_lib tclscripts/rtwizard/lib)
-tclIndex_BUILD(rtwizard_lib tclscripts/rtwizard/lib)
+pkgIndex_BUILD(tclscripts/rtwizard/lib)
+tclIndex_BUILD(tclscripts/rtwizard/lib)
CMAKEFILES(Makefile.am pkgIndex.tcl tclIndex)
Modified: brlcad/trunk/src/tclscripts/sdialogs/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/sdialogs/CMakeLists.txt 2013-05-22 16:33:35 UTC
(rev 55534)
+++ brlcad/trunk/src/tclscripts/sdialogs/CMakeLists.txt 2013-05-22 17:51:53 UTC
(rev 55535)
@@ -4,8 +4,8 @@
sdialogs.tcl
)
BRLCAD_ADDDATA(sdialogs_TCLSCRIPTS tclscripts/sdialogs)
-pkgIndex_BUILD(sdialogs tclscripts/sdialogs)
-tclIndex_BUILD(sdialogs tclscripts/sdialogs)
+pkgIndex_BUILD(tclscripts/sdialogs)
+tclIndex_BUILD(tclscripts/sdialogs)
CMAKEFILES(Makefile.am pkgIndex.tcl tclIndex)
Modified: brlcad/trunk/src/tclscripts/sdialogs/scripts/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/sdialogs/scripts/CMakeLists.txt 2013-05-22
16:33:35 UTC (rev 55534)
+++ brlcad/trunk/src/tclscripts/sdialogs/scripts/CMakeLists.txt 2013-05-22
17:51:53 UTC (rev 55535)
@@ -4,7 +4,7 @@
stddlgs.tcl
)
BRLCAD_ADDDATA(sdialogs_scripts_TCLSCRIPTS tclscripts/sdialogs/scripts)
-tclIndex_BUILD(sdialogs_scripts tclscripts/sdialogs/scripts)
+tclIndex_BUILD(tclscripts/sdialogs/scripts)
CMAKEFILES(Makefile.am tclIndex)
Modified: brlcad/trunk/src/tclscripts/swidgets/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/swidgets/CMakeLists.txt 2013-05-22 16:33:35 UTC
(rev 55534)
+++ brlcad/trunk/src/tclscripts/swidgets/CMakeLists.txt 2013-05-22 17:51:53 UTC
(rev 55535)
@@ -5,8 +5,8 @@
swidgets.tcl
)
BRLCAD_ADDDATA(swidgets_TCLSCRIPTS tclscripts/swidgets)
-pkgIndex_BUILD(swidgets tclscripts/swidgets)
-tclIndex_BUILD(swidgets tclscripts/swidgets)
+pkgIndex_BUILD(tclscripts/swidgets)
+tclIndex_BUILD(tclscripts/swidgets)
CMAKEFILES(Makefile.am pkgIndex.tcl tclIndex)
Modified: brlcad/trunk/src/tclscripts/swidgets/scripts/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/swidgets/scripts/CMakeLists.txt 2013-05-22
16:33:35 UTC (rev 55534)
+++ brlcad/trunk/src/tclscripts/swidgets/scripts/CMakeLists.txt 2013-05-22
17:51:53 UTC (rev 55535)
@@ -6,7 +6,7 @@
tree.itk
)
BRLCAD_ADDDATA(swidgets_scripts_TCLSCRIPTS tclscripts/swidgets/scripts)
-tclIndex_BUILD(swidgets_scripts tclscripts/swidgets/scripts)
+tclIndex_BUILD(tclscripts/swidgets/scripts)
CMAKEFILES(Makefile.am tclIndex)
Modified: brlcad/trunk/src/tclscripts/util/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/util/CMakeLists.txt 2013-05-22 16:33:35 UTC
(rev 55534)
+++ brlcad/trunk/src/tclscripts/util/CMakeLists.txt 2013-05-22 17:51:53 UTC
(rev 55535)
@@ -4,8 +4,8 @@
luniq.tcl
)
BRLCAD_ADDDATA(util_TCLSCRIPTS tclscripts/util)
-pkgIndex_BUILD(util tclscripts/util)
-tclIndex_BUILD(util tclscripts/util)
+pkgIndex_BUILD(tclscripts/util)
+tclIndex_BUILD(tclscripts/util)
CMAKEFILES(Makefile.am pkgIndex.tcl tclIndex)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
