From: Ralph T. <ra...@us...> - 2005-03-28 21:31:58
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28901/adobe-source/adobe/test/visual Modified Files: Jamfile Removed Files: boost-build.jam project-root.jam Log Message: New build system, more like the Jamfiles in Boost. The asl libraries can now be build as /adobe//asl and /adobe//asl_dev (for the regular and development versions). The adam_tutorial and visual code also have nice Jamfiles now. The main benefit of the new Jamfiles is that everything gets built once only (e.g.: /adobe//asl_dev only gets build once if both visual and adam_tutorial are built). The directories which the generated binaries are delivered into are different from the old ones. We put generated binaries into a boost-style tree, e.g.: bin/<compiler>/<variant>/<link type>... --- boost-build.jam DELETED --- Index: Jamfile =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/Jamfile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jamfile 21 Mar 2005 03:57:34 -0000 1.1 --- Jamfile 28 Mar 2005 21:31:49 -0000 1.2 *************** *** 1,28 **** import testing ; - import os ; if [ os.name ] = NT { - PLATFORM_SOURCE_DIR = sources/win ; - PLATFORM_FLAGS = <define>WIN32 <define>_LIB ; PLATFORM_HEADERS = headers/win ; } else { - PLATFORM_SOURCE_DIR = sources/mac ; - PLATFORM_FLAGS = ; PLATFORM_HEADERS = headers/mac ; } ! project ! : requirements <include>../../ ! : requirements <include>../../../ ! : requirements <include>../../source/ ! : requirements <include>../../../third_party/boost_tp/boost/ ! : requirements <include>./headers/ ! : requirements <include>$(PLATFORM_HEADERS) : requirements <toolset>msvc:<linkflags>"gdi32.lib user32.lib comctl32.lib /subsystem:windows" ; exe "visual" ! : sources/express_viewer_new.cpp sources/client_assembler.cpp sources/ui_core.cpp --- 1,25 ---- + # Jamfile for building the VISUAL demo import testing ; import os ; + + # + # We need to include different directories for Windows vs. Mac. + # if [ os.name ] = NT { PLATFORM_HEADERS = headers/win ; + PLATFORM_SOURCE_DIR = sources/win ; } else { PLATFORM_HEADERS = headers/mac ; + PLATFORM_SOURCE_DIR = sources/mac ; } ! project adobe/visual : requirements <toolset>msvc:<linkflags>"gdi32.lib user32.lib comctl32.lib /subsystem:windows" + : requirements <include>headers <link>static ; exe "visual" ! : sources/express_viewer.cpp sources/client_assembler.cpp sources/ui_core.cpp *************** *** 30,69 **** $(PLATFORM_SOURCE_DIR)/display.cpp $(PLATFORM_SOURCE_DIR)/ui_core_implementation.cpp ! ../../source/adam.cpp ! ../../source/adam_evaluate.cpp ! ../../source/adam_parser.cpp ! ../../source/array.cpp ! ../../source/dictionary.cpp ! ../../source/eve.cpp ! ../../source/eve_evaluate.cpp ! ../../source/eve_parser.cpp ! ../../source/expression_parser.cpp ! ../../source/istream.cpp ! ../../source/lex_stream.cpp ! ../../source/name.cpp ! ../../source/parser_shared.cpp ! ../../source/rectangle.cpp ! ../../source/string_pool.cpp ! ../../source/test_configuration.cpp ! ../../source/token.cpp ! ../../source/typeinfo.cpp ! ../../source/value.cpp ! ../../source/virtual_machine.cpp ! ../../future/source/assemblage.cpp ! ../../future/source/iomanip.cpp ! ../../future/source/iomanip_pdf.cpp ! ../../../third_party/boost_tp/boost/libs/filesystem/src/convenience.cpp ! ../../../third_party/boost_tp/boost/libs/filesystem/src/exception.cpp ! ../../../third_party/boost_tp/boost/libs/filesystem/src/operations_posix_windows.cpp ! ../../../third_party/boost_tp/boost/libs/filesystem/src/path_posix_windows.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/connection.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/named_slot_map.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/signal_base.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/slot.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/trackable.cpp ! ../../../third_party/boost_tp/boost/libs/thread/src/exceptions.cpp ! ../../../third_party/boost_tp/boost/libs/thread/src/mutex.cpp ! ../../../third_party/boost_tp/boost/libs/thread/src/once.cpp ! ../../../third_party/boost_tp/boost/libs/thread/src/xtime.cpp ! : <define>ADOBE_SERIALIZATION $(PLATFORM_FLAGS) <define>NOMINMAX <define>BOOST_ALL_NO_LIB <define>BOOST_THREAD_USE_LIB ! ; --- 27,32 ---- $(PLATFORM_SOURCE_DIR)/display.cpp $(PLATFORM_SOURCE_DIR)/ui_core_implementation.cpp ! /adobe//asl_dev ! /boost/filesystem//boost_filesystem ! : <include>$(PLATFORM_HEADERS) ; ! # <variant>release:<define>NDEBUG ; --- project-root.jam DELETED --- |