Menu
▾
▴
[adobe-source-commits] adobe-source/adobe/test/begin Info.plist,1.2,1.3 Jamfile.v2,1.3,1.4 version.plist,1.1,1.2
|
From: Foster B. <fos...@us...> - 2006-02-03 18:21:28
|
Update of /cvsroot/adobe-source/adobe-source/adobe/test/begin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1031/adobe/test/begin Modified Files: Info.plist Jamfile.v2 version.plist Log Message: asl 1.0.13 Index: Info.plist =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/test/begin/Info.plist,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Info.plist 6 Oct 2005 20:43:17 -0000 1.2 --- Info.plist 3 Feb 2006 18:20:47 -0000 1.3 *************** *** 3,55 **** <plist version="1.0"> <dict> ! <key>CFBundleDevelopmentRegion</key> ! <string>English</string> ! <key>CFBundleDocumentTypes</key> ! <array> ! <dict> ! <key>CFBundleTypeExtensions</key> ! <array> ! <string>adm</string> ! </array> ! <key>CFBundleTypeName</key> ! <string>Adam file</string> ! <key>CFBundleTypeRole</key> ! <string>Viewer</string> ! <key>LSTypeIsPackage</key> ! <false/> ! </dict> ! <dict> ! <key>CFBundleTypeExtensions</key> ! <array> ! <string>eve</string> ! </array> ! <key>CFBundleTypeName</key> ! <string>Eve file</string> ! <key>CFBundleTypeRole</key> ! <string>Viewer</string> ! <key>LSTypeIsPackage</key> ! <false/> ! </dict> ! </array> ! <key>CFBundleExecutable</key> ! <string>Adobe Begin</string> ! <key>CFBundleGetInfoString</key> ! <string>Adobe Begin version 1.0, Copyright © 2004-2005 by Adobe Systems, Inc. All rights reserved.</string> ! <key>CFBundleIconFile</key> ! <string>app_icon.icns</string> ! <key>CFBundleIdentifier</key> ! <string>com.adobe.begin</string> ! <key>CFBundleInfoDictionaryVersion</key> ! <string>6.0</string> ! <key>CFBundleName</key> ! <string>Adobe Begin.app</string> ! <key>CFBundlePackageType</key> ! <string>APPL</string> ! <key>CFBundleSignature</key> ! <string>????</string> ! <key>CFBundleVersion</key> ! <string>1.0</string> ! <key>CSResourcesFileMapped</key> ! <true/> </dict> </plist> --- 3,55 ---- <plist version="1.0"> <dict> ! <key>CFBundleDevelopmentRegion</key> ! <string>English</string> ! <key>CFBundleDocumentTypes</key> ! <array> ! <dict> ! <key>CFBundleTypeExtensions</key> ! <array> ! <string>adm</string> ! </array> ! <key>CFBundleTypeName</key> ! <string>Adam file</string> ! <key>CFBundleTypeRole</key> ! <string>Viewer</string> ! <key>LSTypeIsPackage</key> ! <false/> ! </dict> ! <dict> ! <key>CFBundleTypeExtensions</key> ! <array> ! <string>eve</string> ! </array> ! <key>CFBundleTypeName</key> ! <string>Eve file</string> ! <key>CFBundleTypeRole</key> ! <string>Viewer</string> ! <key>LSTypeIsPackage</key> ! <false/> ! </dict> ! </array> ! <key>CFBundleExecutable</key> ! <string>Adobe Begin</string> ! <key>CFBundleGetInfoString</key> ! <string>Adobe Begin version 1.0, Copyright © 2004-2005 by Adobe Systems, Inc. All rights reserved.</string> ! <key>CFBundleIconFile</key> ! <string>app_icon.icns</string> ! <key>CFBundleIdentifier</key> ! <string>com.adobe.begin</string> ! <key>CFBundleInfoDictionaryVersion</key> ! <string>6.0</string> ! <key>CFBundleName</key> ! <string>Adobe Begin.app</string> ! <key>CFBundlePackageType</key> ! <string>APPL</string> ! <key>CFBundleSignature</key> ! <string>????</string> ! <key>CFBundleVersion</key> ! <string>1.0</string> ! <key>CSResourcesFileMapped</key> ! <true/> </dict> </plist> Index: Jamfile.v2 =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/test/begin/Jamfile.v2,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Jamfile.v2 7 Nov 2005 18:00:43 -0000 1.3 --- Jamfile.v2 3 Feb 2006 18:20:47 -0000 1.4 *************** *** 4,92 **** import os ; ! SOURCE_DIRECTORY = sources ; ! HEADER_DIRECTORY = headers ; switch [ os.name ] { case NT : # --- Windows --------------------------------------------------------------------------- ! { ! # ! # Directory name for Windows specific sources and headers ! # ! PLATFORM_DIRECTORIES_NAME = win ; ! # ! # Build settings for Windows ! # ! PLATFORM_SETTINGS = ! # ! # The header file containing the resource definitions is currently ! # used by win/ui_core_implementation.cpp to load an icon in begin. ! # ! <include>resources ! <include>. ! # ! # These definitions say that we're targetting Windows XP. ! # That means that we get various preprocessor definitions which we ! # need, such as the WS_EX_COMPOSITED window style. ! # ! <define>WINVER=0x501 <define>_WIN32_WINNT=0x501 <define>_WIN32_IE=0x501 ! <toolset>msvc:<linkflags>"gdi32.lib user32.lib comctl32.lib shell32.lib" ! # ! # If compiling with GCC we add -mno-cygwin to tell the cygwin compiler ! # and linker that we want a native Windows application. ! # ! <toolset>gcc:<cxxflags>"-mno-cygwin" ! <toolset>gcc:<linkflags>"-lgdi32 -lshell32 -luser32 -lcomctl32 -mno-cygwin" ! ; ! # ! # The resource file should only be included on the executable. ! # We don't want it in the library, so this PLATFORM_EXTRA ! # variable is defined. ! # ! PLATFORM_EXTRAS = resources/resources.rc ; ! } case FREEBSD : ! { ! PLATFORM_DIRECTORIES_NAME = fltk ; ! # ! # Details of *your* local FLTK2 installation must be added here. ! # ! PLATFORM_SETTINGS = <linkflags>"-L/usr/X11R6/lib -lXft -L/usr/local/lib -lfreetype -lz -lfontconfig -lXrender -lXext -lXi -lX11" ; ! PLATFORM_EXTRAS = ; ! } case MACOSX : # --- Mac OS (assumed) ------------------------------------------------------------------ ! { ! # ! # Directory name for MacOS specific sources ! # ! PLATFORM_DIRECTORIES_NAME = mac ; ! # ! # Build settings for MacOS ! # ! PLATFORM_SETTINGS = <toolset>darwin:<linkflags>"-framework Carbon" ; ! ! # ! # MacOS has no extra requirements. ! # ! PLATFORM_EXTRAS = ; ! } } # ------------------------------------------------------------------------------------------------- ! INCLUDE = <include>$(HEADER_DIRECTORY) <include>$(HEADER_DIRECTORY)/$(PLATFORM_DIRECTORIES_NAME) ; EXE_SOURCES = ! $(SOURCE_DIRECTORY)/express_viewer.cpp ! $(SOURCE_DIRECTORY)/report_exception.cpp ! $(SOURCE_DIRECTORY)/$(PLATFORM_DIRECTORIES_NAME)/main.cpp ! ; # ------------------------------------------------------------------------------------------------- --- 4,124 ---- import os ; ! SOURCE_DIRECTORY = sources ; ! HEADER_DIRECTORY = headers ; ! switch [ os.name ] { case NT : # --- Windows --------------------------------------------------------------------------- ! { ! # ! # Directory name for Windows specific sources and headers ! # ! PLATFORM_DIRECTORIES_NAME = ! win32 ! ; + # + # Build settings for Windows + # + PLATFORM_SETTINGS = + # + # The header file containing the resource definitions is currently + # used by win/ui_core_implementation.cpp to load an icon in begin. + # + <include>resources + <include>. + # + # These definitions say that we're targetting Windows XP. + # That means that we get various preprocessor definitions which we + # need, such as the WS_EX_COMPOSITED window style. + # + <define>WINVER=0x501 <define>_WIN32_WINNT=0x501 <define>_WIN32_IE=0x501 + <toolset>msvc:<linkflags>"gdi32.lib user32.lib comctl32.lib shell32.lib" ! # Commented out because manifests aren't working in boost 1.33.1 anyhow ! # ! # <toolset>msvc,<toolset-msvc:version>8.0:<define>ADOBE_VER=8 ! # <toolset>msvc,<toolset-msvc:version>7.1:<define>ADOBE_VER=7 ! # ! # If compiling with GCC we add -mno-cygwin to tell the cygwin compiler ! # and linker that we want a native Windows application. ! # ! <toolset>gcc:<cxxflags>"-mno-cygwin" ! <toolset>gcc:<linkflags>"-lgdi32 -lshell32 -luser32 -lcomctl32 -mno-cygwin" ! ; ! # ! # The resource file should only be included on the executable. ! # We don't want it in the library, so this PLATFORM_EXTRA ! # variable is defined. ! # ! PLATFORM_EXTRAS = ! resources/resources.rc ! ; ! } case FREEBSD : ! { ! PLATFORM_DIRECTORIES_NAME = ! fltk ! ; ! # ! # Details of *your* local FLTK2 installation must be added here. ! # ! PLATFORM_SETTINGS = ! <linkflags>"-L/usr/X11R6/lib -lXft -L/usr/local/lib -lfreetype -lz -lfontconfig -lXrender -lXext -lXi -lX11" ! ; ! PLATFORM_EXTRAS = ! ; ! } case MACOSX : # --- Mac OS (assumed) ------------------------------------------------------------------ ! { ! # ! # Directory name for MacOS specific sources ! # ! PLATFORM_DIRECTORIES_NAME = ! mac ! ; ! # ! # Build settings for MacOS ! # ! PLATFORM_SETTINGS = ! <toolset>darwin:<linkflags>"-framework Carbon" ! ; ! ! # ! # MacOS has no extra requirements. ! # ! PLATFORM_EXTRAS = ! ; ! } } # ------------------------------------------------------------------------------------------------- ! INCLUDE = ! <include>$(HEADER_DIRECTORY) ! <include>$(HEADER_DIRECTORY)/$(PLATFORM_DIRECTORIES_NAME) ! ; EXE_SOURCES = ! $(SOURCE_DIRECTORY)/express_viewer.cpp ! $(SOURCE_DIRECTORY)/report_exception.cpp ! $(SOURCE_DIRECTORY)/$(PLATFORM_DIRECTORIES_NAME)/main.cpp ! ; ! ! # ------------------------------------------------------------------------------------------------- ! ! project adobe/begin ! : requirements ! <user-interface>gui ! $(INCLUDE) ! : usage-requirements ! $(INCLUDE) ! ; # ------------------------------------------------------------------------------------------------- *************** *** 94,122 **** switch [ os.name ] { ! case MACOSX : ! { ! BINARY_NAME = "Adobe Begin" ; ! } case * : ! { ! BINARY_NAME = "begin" ; ! } } - # ------------------------------------------------------------------------------------------------- ! project adobe/begin ! : requirements ! <user-interface>gui ! $(INCLUDE) ! : usage-requirements ! $(INCLUDE) ! ; exe $(BINARY_NAME) ! : $(EXE_SOURCES) ! /adobe/adobe_widgets//adobe_widgets ! $(PLATFORM_EXTRAS) ! : $(PLATFORM_SETTINGS) ! ; # Construct the destination path location --- 126,152 ---- switch [ os.name ] { ! case MACOSX : ! { ! BINARY_NAME = "Adobe Begin" ; ! } ! case NT : ! { ! manifest begin.exe : resources/begin.exe.manifesttmpl ; ! BINARY_NAME = "begin" ; ! } case * : ! { ! BINARY_NAME "begin" ; ! } } ! # ------------------------------------------------------------------------------------------------- exe $(BINARY_NAME) ! : $(EXE_SOURCES) ! /adobe/adobe_widgets//adobe_widgets ! $(PLATFORM_EXTRAS) ! : $(PLATFORM_SETTINGS) ! ; # Construct the destination path location *************** *** 126,176 **** switch [ os.name ] { ! case MACOSX : ! { ! # set up the bundle of the app ! ! install "Adobe Begin.app/Contents" ! : Info.plist ! resources/PkgInfo ! : <variant>release:<location>$(DEST_PATH)"release/Adobe Begin.app/Contents" ! <variant>debug:<location>$(DEST_PATH)"debug/Adobe Begin.app/Contents" ! ; ! ! install "Adobe Begin.app/Contents/MacOS" ! : "Adobe Begin" ! : <variant>release:<location>$(DEST_PATH)"release/Adobe Begin.app/Contents/MacOS" ! <variant>debug:<location>$(DEST_PATH)"debug/Adobe Begin.app/Contents/MacOS" ! ; ! ! install "Adobe Begin.app/Contents/Resources/begin.nib" ! : [ glob resources/begin.nib/*.* ] ! : <variant>release:<location>$(DEST_PATH)"release/Adobe Begin.app/Contents/Resources/begin.nib" ! <variant>debug:<location>$(DEST_PATH)"debug/Adobe Begin.app/Contents/Resources/begin.nib" ! ; ! ! install "Adobe Begin.app/Contents/Resources" ! : resources/app_icon.icns ! resources/editor.adm ! resources/editor.eve ! resources/eve_globals.scp ! resources/glossary.xstr ! resources/link_icon.png ! resources/metrics_glossary.xstr ! : <variant>release:<location>$(DEST_PATH)"release/Adobe Begin.app/Contents/Resources" ! <variant>debug:<location>$(DEST_PATH)"debug/Adobe Begin.app/Contents/Resources" ! ; ! } ! case * : ! { ! install "Adobe Begin" ! : begin ! resources/editor.adm ! resources/editor.eve ! resources/eve_globals.scp ! resources/glossary.xstr ! : <variant>release:<location>$(DEST_PATH)"release/Adobe Begin" ! <variant>debug:<location>$(DEST_PATH)"debug/Adobe Begin" ! ; ! } } --- 156,219 ---- switch [ os.name ] { ! case MACOSX : ! { ! # set up the bundle of the app ! ! install "Adobe Begin.app/Contents" ! : Info.plist ! resources/PkgInfo ! : <variant>release:<location>$(DEST_PATH)"release/Adobe Begin.app/Contents" ! <variant>debug:<location>$(DEST_PATH)"debug/Adobe Begin.app/Contents" ! ; ! ! install "Adobe Begin.app/Contents/MacOS" ! : "Adobe Begin" ! : <variant>release:<location>$(DEST_PATH)"release/Adobe Begin.app/Contents/MacOS" ! <variant>debug:<location>$(DEST_PATH)"debug/Adobe Begin.app/Contents/MacOS" ! ; ! ! install "Adobe Begin.app/Contents/Resources/begin.nib" ! : [ glob resources/begin.nib/*.* ] ! : <variant>release:<location>$(DEST_PATH)"release/Adobe Begin.app/Contents/Resources/begin.nib" ! <variant>debug:<location>$(DEST_PATH)"debug/Adobe Begin.app/Contents/Resources/begin.nib" ! ; ! ! install "Adobe Begin.app/Contents/Resources" ! : resources/app_icon.icns ! resources/editor.adm ! resources/editor.eve ! resources/eve_globals.scp ! resources/glossary.xstr ! resources/link_icon.png ! resources/metrics_glossary.xstr ! : <variant>release:<location>$(DEST_PATH)"release/Adobe Begin.app/Contents/Resources" ! <variant>debug:<location>$(DEST_PATH)"debug/Adobe Begin.app/Contents/Resources" ! ; ! } ! case NT : ! { ! install "Adobe Begin" ! : begin ! begin.exe ! resources/editor.adm ! resources/editor.eve ! resources/eve_globals.scp ! resources/glossary.xstr ! : <variant>release:<location>$(DEST_PATH)"release/Adobe Begin" ! <variant>debug:<location>$(DEST_PATH)"debug/Adobe Begin" ! ; ! } ! case * : ! { ! install "Adobe Begin" ! : begin ! resources/editor.adm ! resources/editor.eve ! resources/eve_globals.scp ! resources/glossary.xstr ! : <variant>release:<location>$(DEST_PATH)"release/Adobe Begin" ! <variant>debug:<location>$(DEST_PATH)"debug/Adobe Begin" ! ; ! } } Index: version.plist =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/test/begin/version.plist,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** version.plist 7 Jul 2005 22:00:25 -0000 1.1 --- version.plist 3 Feb 2006 18:20:47 -0000 1.2 *************** *** 3,16 **** <plist version="1.0"> <dict> ! <key>BuildVersion</key> ! <string>92</string> ! <key>CFBundleVersion</key> ! <string>1.0</string> ! <key>ProductBuildVersion</key> ! <string>7K571</string> ! <key>ProjectName</key> ! <string>NibPBTemplates</string> ! <key>SourceVersion</key> ! <string>1200000</string> </dict> </plist> --- 3,16 ---- <plist version="1.0"> <dict> ! <key>BuildVersion</key> ! <string>92</string> ! <key>CFBundleVersion</key> ! <string>1.0</string> ! <key>ProductBuildVersion</key> ! <string>7K571</string> ! <key>ProjectName</key> ! <string>NibPBTemplates</string> ! <key>SourceVersion</key> ! <string>1200000</string> </dict> </plist> |
