From: Ralph T. <ra...@us...> - 2005-03-28 21:32:17
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28901/adobe-source/adobe/build 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/build/Jamfile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jamfile 19 Mar 2005 00:16:39 -0000 1.1 --- Jamfile 28 Mar 2005 21:31:48 -0000 1.2 *************** *** 1,12 **** import testing ; ! project ! : requirements <include>../ ! : requirements <include>../../ ! : requirements <include>../source/ ! : requirements <include>../../third_party/boost_tp/boost/ ; - build-project asl_lib/ ; - build-project asl_lib_dev/ ; - build-project boost_lib/ ; --- 1,113 ---- + # Main Jamfile for building ASL import testing ; + import os ; + # + # This is the extra code required when using serialization. + # + FUTURE_SRC = + assemblage + iomanip + iomanip_pdf + ; + # + # We build two libraries, asl and asl_dev. asl_dev includes the future + # sources and supports serialization. We define a project to make it + # easy to maintain various flags. + # + project adobe + : source-location .. + : usage-requirements + # + # These usage requirements propagate to everything which uses this project. + # + <include>../.. + ; ! alias boost_thread : /boost/thread//boost_thread ; ! alias boost_signals : /boost/signals//boost_signals ; ! # ! # Define flags we need to use to build the objects for the two libraries. ! # ! ASL_OBJ_FLAGS = ! <define>BOOST_THREAD_USE_LIB ! <define>NOMINMAX ! <define>BOOST_THREAD_USE_LIB ! <define>BOOST_ALL_NO_LIB ! # ! # Sadly we have to redefine some of the project parameters ! # here, because the bits inside [ ] are separate from the ! # rest of the setup (we put objects into [ ] so that we can ! # build the same source multiple times...). ! # ! <include>../.. ! <use>boost_thread ! <use>boost_signals ! ; ! ASL_DEV_OBJ_FLAGS = ! $(ASL_OBJ_FLAGS) ! <define>ADOBE_SERIALIZATION ! ; ! # ! # Unfortunately to get the same source file to build twice we need to do ! # some nasty [ obj ... ] type things. For more information see this page: ! # ! # http://www.boost.org/doc/html/bbv2/faq.html ! # ! lib asl_dev : ! [ obj adam_dev_o : source/adam.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj adam_evaluate_dev_o : source/adam_evaluate.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj adam_parser_dev_o : source/adam_parser.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj array_dev_o : source/array.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj dictionary_dev_o : source/dictionary.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj eve_dev_o : source/eve.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj eve_evaluate_dev_o : source/eve_evaluate.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj eve_parser_dev_o : source/eve_parser.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj expression_parser_dev_o : source/expression_parser.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj istream_dev_o : source/istream.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj lex_stream_dev_o : source/lex_stream.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj name_dev_o : source/name.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj parser_shared_dev_o : source/parser_shared.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj rectangle_dev_o : source/rectangle.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj string_pool_dev_o : source/string_pool.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj test_configuration_dev_o : source/test_configuration.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj token_dev_o : source/token.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj typeinfo_dev_o : source/typeinfo.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj value_dev_o : source/value.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj virtual_machine_dev_o : source/virtual_machine.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! # ! # Add the future sources to the dev build. ! # ! future/source/$(FUTURE_SRC).cpp ! : $(ASL_DEV_OBJ_FLAGS) <link>static ! : ! : <library>boost_signals <library>boost_thread $(ASL_DEV_OBJ_FLAGS) ! ; ! # ! # The asl rule uses similar Jam hackery to build it's objects. ! # ! lib asl : ! [ obj adam_o : source/adam.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj adam_evaluate_o : source/adam_evaluate.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj adam_parser_o : source/adam_parser.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj array_o : source/array.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj dictionary_o : source/dictionary.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj eve_o : source/eve.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj eve_evaluate_o : source/eve_evaluate.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj eve_parser_o : source/eve_parser.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj expression_parser_o : source/expression_parser.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj istream_o : source/istream.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj lex_stream_o : source/lex_stream.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj name_o : source/name.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj parser_shared_o : source/parser_shared.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj rectangle_o : source/rectangle.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj string_pool_o : source/string_pool.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj test_configuration_o : source/test_configuration.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj token_o : source/token.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj typeinfo_o : source/typeinfo.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj value_o : source/value.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj virtual_machine_o : source/virtual_machine.cpp : $(ASL_OBJ_FLAGS) ] ! : <use>boost_signals <use>boost_thread $(ASL_OBJ_FLAGS) <link>static ! : ! : <library>boost_signals <library>boost_thread $(ASL_OBJ_FLAGS) ; --- project-root.jam DELETED --- |