Revision: 57299
http://sourceforge.net/p/brlcad/code/57299
Author: starseeker
Date: 2013-08-30 00:54:38 +0000 (Fri, 30 Aug 2013)
Log Message:
-----------
Update stepcode related build logic in BRL-CAD
Modified Paths:
--------------
brlcad/trunk/src/conv/step/CMakeLists.txt
brlcad/trunk/src/conv/step/g-step/CMakeLists.txt
brlcad/trunk/src/conv/step/step-g/CMakeLists.txt
brlcad/trunk/src/other/CMakeLists.txt
brlcad/trunk/src/other/stepcode.dist
Modified: brlcad/trunk/src/conv/step/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/CMakeLists.txt 2013-08-30 00:47:51 UTC (rev
57298)
+++ brlcad/trunk/src/conv/step/CMakeLists.txt 2013-08-30 00:54:38 UTC (rev
57299)
@@ -1,4 +1,4 @@
-# Because the fedex_plus outputs are used by both step-g and g-step,
+# Because the exp2cxx outputs are used by both step-g and g-step,
# the logic both commands need is the same and is defined up front.
set(STEP_INCLUDE_DIRS
@@ -34,17 +34,17 @@
# read the schema name from a line like 'SCHEMA AUTOMOTIVE_DESIGN;'
file(STRINGS ${SCHEMA_FILE} SCHEMA_STATEMENT LIMIT_COUNT 1 REGEX "SCHEMA .*")
string(REGEX REPLACE "^SCHEMA \(.*\)\;$" "\\1" SCHEMA_N ${SCHEMA_STATEMENT} )
- string(TOUPPER ${SCHEMA_N} SCHEMA_NAME) #fedex_plus always uses upper case
for file names
+ string(TOUPPER ${SCHEMA_N} SCHEMA_NAME) #exp2cxx always uses upper case for
file names
- # Because SCHEMA_OUT_DIR is the working directory for fedex_plus, it must be
- # created at configure time and be present when fedex_plus is run
+ # Because SCHEMA_OUT_DIR is the working directory for exp2cxx, it must be
+ # created at configure time and be present when exp2cxx is run
set(SCHEMA_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME})
make_directory(${SCHEMA_OUT_DIR})
include_directories(${SCHEMA_OUT_DIR})
DISTCLEAN(${SCHEMA_OUT_DIR})
- # These files are the standard fedex_plus outputs that need to be compiled.
- set(fedex_srcs
+ # These files are the standard exp2cxx outputs that need to be compiled.
+ set(express_srcs
${SCHEMA_OUT_DIR}/Sdai${SCHEMA_NAME}.cc
${SCHEMA_OUT_DIR}/Sdai${SCHEMA_NAME}.init.cc
${SCHEMA_OUT_DIR}/SdaiAll.cc
@@ -54,27 +54,27 @@
# For the subdirectory add_custom_command definitions, need the generated
# headers as well.
- set(FEDEX_OUTPUT
- ${fedex_srcs}
+ set(EXPRESS_OUTPUT
+ ${express_srcs}
${SCHEMA_OUT_DIR}/Sdai${SCHEMA_NAME}.h
${SCHEMA_OUT_DIR}/Sdaiclasses.h
${SCHEMA_OUT_DIR}/schema.h
)
- # Define a common custom build target that ensures the fedex_plus outputs
+ # Define a common custom build target that ensures the exp2cxx outputs
# are present. Do this rather than relying on custom commands in the
- # subdirectories to avoid multiple build targets trying to run fedex_plus
+ # subdirectories to avoid multiple build targets trying to run exp2cxx
# simultaneously to generate identical inputs (unknown if that is
problematic)
# and to add extra robustness for parallel build target ordering.
- add_custom_command(OUTPUT ${FEDEX_OUTPUT}
${SCHEMA_OUT_DIR}/step_fedex_${SCHEMA_NAME}.done
- COMMAND ${FEDEX_PLUS_EXEC} ARGS ${SCHEMA_FILE}
- COMMAND ${CMAKE_COMMAND} -E touch
${SCHEMA_OUT_DIR}/step_fedex_${SCHEMA_NAME}.done
- DEPENDS ${SCHEMA_FILE} ${FEDEX_PLUS_EXECUTABLE_TARGET}
+ add_custom_command(OUTPUT ${EXPRESS_OUTPUT}
${SCHEMA_OUT_DIR}/step_express_${SCHEMA_NAME}.done
+ COMMAND ${EXP2CXX_EXEC} ARGS ${SCHEMA_FILE}
+ COMMAND ${CMAKE_COMMAND} -E touch
${SCHEMA_OUT_DIR}/step_express_${SCHEMA_NAME}.done
+ DEPENDS ${SCHEMA_FILE} ${EXP2CXX_EXECUTABLE_TARGET}
WORKING_DIRECTORY ${SCHEMA_OUT_DIR}
COMMENT "Generating C++ code to express ${SCHEMA_NAME}..."
VERBATIM)
- add_custom_target(step-fedex-${SCHEMA_NAME}-${TARGET_SUFFIX}
- DEPENDS ${SCHEMA_OUT_DIR}/step_fedex_${SCHEMA_NAME}.done)
+ add_custom_target(step-express-${SCHEMA_NAME}-${TARGET_SUFFIX}
+ DEPENDS ${SCHEMA_OUT_DIR}/step_express_${SCHEMA_NAME}.done)
endmacro(GENERATE_SCHEMA_INPUTS SCHEMA_FILE)
add_subdirectory(step-g)
Modified: brlcad/trunk/src/conv/step/g-step/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/g-step/CMakeLists.txt 2013-08-30 00:47:51 UTC
(rev 57298)
+++ brlcad/trunk/src/conv/step/g-step/CMakeLists.txt 2013-08-30 00:54:38 UTC
(rev 57299)
@@ -7,7 +7,7 @@
GENERATE_SCHEMA_INPUTS(${STEP_SCHEMA_FILE} gstep)
set(gstep_SOURCES
- ${fedex_srcs}
+ ${express_srcs}
../BRLCADWrapper.cpp
ON_Brep.cpp
g-step.cpp
@@ -30,7 +30,7 @@
#add_definitions(-DAP203e2)
BRLCAD_ADDEXEC(g-step "${gstep_SOURCES}" "${gstep_LIBS}" NO_STRICT)
-add_dependencies(g-step step-fedex-${SCHEMA_NAME}-gstep)
+add_dependencies(g-step step-express-${SCHEMA_NAME}-gstep)
if(MSVC)
set(gstep_IMPORTS
Modified: brlcad/trunk/src/conv/step/step-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/step-g/CMakeLists.txt 2013-08-30 00:47:51 UTC
(rev 57298)
+++ brlcad/trunk/src/conv/step/step-g/CMakeLists.txt 2013-08-30 00:54:38 UTC
(rev 57299)
@@ -7,7 +7,7 @@
GENERATE_SCHEMA_INPUTS(${STEP_SCHEMA_FILE} stepg)
set(stepg_SOURCES
- ${fedex_srcs}
+ ${express_srcs}
../BRLCADWrapper.cpp
../STEPWrapper.cpp
AdvancedBrepShapeRepresentation.cpp
@@ -422,7 +422,7 @@
#add_definitions(-DAP203e2)
BRLCAD_ADDEXEC(step-g "${stepg_SOURCES}" "${stepg_LIBS}" NO_STRICT)
-add_dependencies(step-g step-fedex-${SCHEMA_NAME}-stepg)
+add_dependencies(step-g step-express-${SCHEMA_NAME}-stepg)
if(MSVC)
set(stepg_IMPORTS
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2013-08-30 00:47:51 UTC (rev
57298)
+++ brlcad/trunk/src/other/CMakeLists.txt 2013-08-30 00:54:38 UTC (rev
57299)
@@ -803,10 +803,10 @@
set(SC_BUILD_SCHEMAS "" CACHE STRING "Disable schema builds for BRL-CAD" FORCE)
THIRD_PARTY(scl stepcode "LEMON_EXECUTABLE;PERPLEX_EXECUTABLE;BRLCAD_LEVEL3"
scl_ALIASES scl_DESCRIPTION NOSYS)
if(BRLCAD_SCL_BUILD)
- set(FEDEX_PLUS_EXEC fedex_plus CACHE STRING "Fedex plus executable" FORCE)
- set(FEDEX_PLUS_EXECUTABLE_TARGET fedex_plus CACHE STRING "Fedex plus
executable target" FORCE)
- mark_as_advanced(FEDEX_PLUS_EXEC)
- mark_as_advanced(FEDEX_PLUS_EXECUTABLE_TARGET)
+ set(EXP2CXX_EXEC exp2cxx CACHE STRING "Express to C++ executable" FORCE)
+ set(EXP2CXX_EXECUTABLE_TARGET exp2cxx CACHE STRING "Express to C++
executable target" FORCE)
+ mark_as_advanced(EXP2CXX_EXEC)
+ mark_as_advanced(EXP2CXX_EXECUTABLE_TARGET)
DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/stepcode/include/sc_cf.h.in)
DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/stepcode/sc_version_string.h.txt)
endif(BRLCAD_SCL_BUILD)
Modified: brlcad/trunk/src/other/stepcode.dist
===================================================================
--- brlcad/trunk/src/other/stepcode.dist 2013-08-30 00:47:51 UTC (rev
57298)
+++ brlcad/trunk/src/other/stepcode.dist 2013-08-30 00:54:38 UTC (rev
57299)
@@ -124,9 +124,9 @@
src/express/parse_data.h
src/express/stack.h
src/express/token_type.h
-src/fedex_plus/classes.h
-src/fedex_plus/complexSupport.h
-src/fedex_python
+src/exp2cxx/classes.h
+src/exp2cxx/complexSupport.h
+src/exp2python
src/test
test
)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
