[haiku-commits] r40906 - in haiku/branches/features/package-management: . build/jam build/scripts data/bin data/catalogs/add-ons/disk_systems/bfs ...
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 10 Mar 2011 22:21:56 +0100 (CET)
Author: zooey
Date: 2011-03-10 22:21:54 +0100 (Thu, 10 Mar 2011)
New Revision: 40906
Changeset: http://dev.haiku-os.org/changeset/40906
Added:
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/butterfly/
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/butterfly/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/butterfly/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/butterfly/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/butterfly/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/butterfly/sv.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/debugnow/
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/debugnow/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/debugnow/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/debugnow/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/debugnow/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/debugnow/sv.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/haiku/
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/haiku/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/haiku/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/haiku/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/haiku/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/haiku/sv.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/icons/
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/icons/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/icons/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/icons/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/icons/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/icons/sv.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/ifs/
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/ifs/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/ifs/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/ifs/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/ifs/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/ifs/sv.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/message/
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/message/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/message/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/message/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/message/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/message/sv.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/spider/
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/spider/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/spider/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/spider/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/spider/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/spider/sv.catkeys
haiku/branches/features/package-management/data/catalogs/apps/mediaconverter/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/sudoku/
haiku/branches/features/package-management/data/catalogs/apps/sudoku/be.catkeys
haiku/branches/features/package-management/data/catalogs/apps/sudoku/fi.catkeys
haiku/branches/features/package-management/data/catalogs/apps/sudoku/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/sudoku/sv.catkeys
haiku/branches/features/package-management/data/catalogs/servers/registrar/fr.catkeys
haiku/branches/features/package-management/docs/userguide/en/images/apps-images/midiplayer.png
haiku/branches/features/package-management/docs/userguide/en/images/apps-images/packageinstaller-installer.png
haiku/branches/features/package-management/docs/userguide/en/images/apps-images/packageinstaller.png
haiku/branches/features/package-management/docs/userguide/en/images/prefs-images/locale-formatting.png
haiku/branches/features/package-management/docs/userguide/en/images/prefs-images/locale-language.png
haiku/branches/features/package-management/docs/userguide/images/desktop-applets-images/powerstatus-icon_16.png
haiku/branches/features/package-management/docs/userguide/images/desktop-applets-images/powerstatus-icon_64.png
haiku/branches/features/package-management/src/add-ons/screen_savers/butterfly/Butterfly.rdef
haiku/branches/features/package-management/src/add-ons/screen_savers/debugnow/DebugNow.rdef
haiku/branches/features/package-management/src/add-ons/screen_savers/haiku/ScreenSaver.rdef
haiku/branches/features/package-management/src/add-ons/screen_savers/icons/Icons.rdef
haiku/branches/features/package-management/src/add-ons/screen_savers/ifs/IFS.rdef
haiku/branches/features/package-management/src/add-ons/screen_savers/leaves/Leaves.rdef
haiku/branches/features/package-management/src/add-ons/screen_savers/message/Message.rdef
haiku/branches/features/package-management/src/add-ons/screen_savers/spider/Spider.rdef
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/Jamfile
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/analysis.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/bit_writer.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/bit_writer.h
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/config.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/cost.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/cost.h
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/dsp.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/filter.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/frame.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/iterator.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/picture.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/quant.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/syntax.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/tree.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/vp8enci.h
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/webpenc.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/webp/encode.h
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/webp/types.h
haiku/branches/features/package-management/src/preferences/mail/ProviderInfo/yahoo.com.rdef
Removed:
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/butterfly/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/butterfly/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/butterfly/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/butterfly/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/butterfly/sv.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/debugnow/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/debugnow/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/debugnow/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/debugnow/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/debugnow/sv.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/haiku/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/haiku/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/haiku/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/haiku/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/haiku/sv.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/icons/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/icons/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/icons/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/icons/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/icons/sv.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/ifs/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/ifs/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/ifs/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/ifs/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/ifs/sv.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/message/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/message/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/message/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/message/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/message/sv.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/spider/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/spider/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/spider/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/spider/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/screen_savers/spider/sv.catkeys
haiku/branches/features/package-management/data/catalogs/apps/sudoku/be.catkeys
haiku/branches/features/package-management/data/catalogs/apps/sudoku/fi.catkeys
haiku/branches/features/package-management/data/catalogs/apps/sudoku/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/sudoku/sv.catkeys
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/Jamfile
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/analysis.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/bit_writer.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/bit_writer.h
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/config.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/cost.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/cost.h
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/dsp.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/filter.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/frame.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/iterator.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/picture.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/quant.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/syntax.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/tree.c
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/vp8enci.h
haiku/branches/features/package-management/src/add-ons/translators/webp/libwebp/enc/webpenc.c
Modified:
haiku/branches/features/package-management/
haiku/branches/features/package-management/build/jam/HaikuCD
haiku/branches/features/package-management/build/jam/HaikuImage
haiku/branches/features/package-management/build/jam/ImageRules
haiku/branches/features/package-management/build/jam/OptionalBuildFeatures
haiku/branches/features/package-management/build/jam/OptionalLibPackages
haiku/branches/features/package-management/build/jam/OptionalPackageDependencies
haiku/branches/features/package-management/build/jam/OptionalPackages
haiku/branches/features/package-management/build/scripts/build_haiku_image
haiku/branches/features/package-management/data/bin/installoptionalpackage
haiku/branches/features/package-management/data/catalogs/add-ons/disk_systems/bfs/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/bmp/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/exr/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/gif/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/hvif/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/ico/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/ico/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/jpeg/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/jpeg/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/jpeg2000/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/pcx/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/ppm/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/ppm/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/raw/fr.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/raw/sv.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/sgi/ru.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/webp/be.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/webp/fi.catkeys
haiku/branches/features/package-management/data/catalogs/add-ons/translators/webp/sv.catkeys
haiku/branches/features/package-management/data/catalogs/apps/activitymonitor/fi.catkeys
haiku/branches/features/package-management/data/catalogs/apps/activitymonitor/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/charactermap/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/charactermap/sv.catkeys
haiku/branches/features/package-management/data/catalogs/apps/codycam/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/deskbar/be.catkeys
haiku/branches/features/package-management/data/catalogs/apps/deskbar/fi.catkeys
haiku/branches/features/package-management/data/catalogs/apps/deskbar/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/deskbar/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/deskbar/sv.catkeys
haiku/branches/features/package-management/data/catalogs/apps/deskcalc/be.catkeys
haiku/branches/features/package-management/data/catalogs/apps/deskcalc/fi.catkeys
haiku/branches/features/package-management/data/catalogs/apps/deskcalc/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/deskcalc/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/deskcalc/sv.catkeys
haiku/branches/features/package-management/data/catalogs/apps/devices/fi.catkeys
haiku/branches/features/package-management/data/catalogs/apps/devices/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/devices/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/diskprobe/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/drivesetup/sv.catkeys
haiku/branches/features/package-management/data/catalogs/apps/icon-o-matic/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/installer/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/installer/sv.catkeys
haiku/branches/features/package-management/data/catalogs/apps/launchbox/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/magnify/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/mail/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/mail/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/mediaconverter/be.catkeys
haiku/branches/features/package-management/data/catalogs/apps/mediaconverter/fi.catkeys
haiku/branches/features/package-management/data/catalogs/apps/mediaconverter/sv.catkeys
haiku/branches/features/package-management/data/catalogs/apps/mediaplayer/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/mediaplayer/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/mediaplayer/sv.catkeys
haiku/branches/features/package-management/data/catalogs/apps/midiplayer/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/networkstatus/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/networkstatus/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/people/be.catkeys
haiku/branches/features/package-management/data/catalogs/apps/people/fi.catkeys
haiku/branches/features/package-management/data/catalogs/apps/people/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/people/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/people/sv.catkeys
haiku/branches/features/package-management/data/catalogs/apps/poorman/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/powerstatus/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/powerstatus/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/processcontroller/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/processcontroller/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/processcontroller/sv.catkeys
haiku/branches/features/package-management/data/catalogs/apps/pulse/sv.catkeys
haiku/branches/features/package-management/data/catalogs/apps/soundrecorder/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/stylededit/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/terminal/be.catkeys
haiku/branches/features/package-management/data/catalogs/apps/terminal/fi.catkeys
haiku/branches/features/package-management/data/catalogs/apps/terminal/fr.catkeys
haiku/branches/features/package-management/data/catalogs/apps/terminal/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/terminal/sv.catkeys
haiku/branches/features/package-management/data/catalogs/apps/terminal/uk.catkeys
haiku/branches/features/package-management/data/catalogs/apps/text_search/ru.catkeys
haiku/branches/features/package-management/data/catalogs/apps/workspaces/ru.catkeys
haiku/branches/features/package-management/data/catalogs/kits/bluetooth/fi.catkeys
haiku/branches/features/package-management/data/catalogs/kits/locale/fr.catkeys
haiku/branches/features/package-management/data/catalogs/kits/tracker/fr.catkeys
haiku/branches/features/package-management/data/catalogs/kits/tracker/sv.catkeys
haiku/branches/features/package-management/data/catalogs/preferences/appearance/be.catkeys
haiku/branches/features/package-management/data/catalogs/preferences/appearance/fr.catkeys
haiku/branches/features/package-management/data/catalogs/preferences/appearance/sv.catkeys
haiku/branches/features/package-management/data/catalogs/preferences/backgrounds/fr.catkeys
haiku/branches/features/package-management/data/catalogs/preferences/bluetooth/fi.catkeys
haiku/branches/features/package-management/data/catalogs/preferences/cpufrequency/fr.catkeys
haiku/branches/features/package-management/data/catalogs/preferences/datatranslations/ru.catkeys
haiku/branches/features/package-management/data/catalogs/preferences/filetypes/fr.catkeys
haiku/branches/features/package-management/data/catalogs/preferences/filetypes/sv.catkeys
[... truncated: 195 changed files follow ...]
Log:
* merged changes from trunk
Property changes on: haiku/branches/features/package-management
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals:40148-40195
/haiku/branches/developer/bonefish/weak-symbols:39365-39568
/haiku/trunk:40664-40800
+ /haiku/branches/developer/bonefish/signals:40148-40195
/haiku/branches/developer/bonefish/weak-symbols:39365-39568
/haiku/trunk:40664-40905
Modified: haiku/branches/features/package-management/build/jam/HaikuCD
===================================================================
--- haiku/branches/features/package-management/build/jam/HaikuCD
2011-03-10 20:11:32 UTC (rev 40905)
+++ haiku/branches/features/package-management/build/jam/HaikuCD
2011-03-10 21:21:54 UTC (rev 40906)
@@ -18,7 +18,6 @@
AddVariableToScript $(script) : outputDir : $(HAIKU_OUTPUT_DIR) ;
AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
AddVariableToScript $(script) : isCD : 1 ;
-AddVariableToScript $(script) : gccVersion : $(HAIKU_GCC_VERSION[1]) ;
AddVariableToScript $(script) : cdLabel : $(HAIKU_CD_LABEL) ;
AddVariableToScript $(script) : addBuildCompatibilityLibDir
: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
Modified: haiku/branches/features/package-management/build/jam/HaikuImage
===================================================================
--- haiku/branches/features/package-management/build/jam/HaikuImage
2011-03-10 20:11:32 UTC (rev 40905)
+++ haiku/branches/features/package-management/build/jam/HaikuImage
2011-03-10 21:21:54 UTC (rev 40906)
@@ -180,6 +180,9 @@
$(X86_ONLY)ipw2100 $(X86_ONLY)iprowifi2200 $(X86_ONLY)iprowifi3945
$(X86_ONLY)iprowifi4965 $(X86_ONLY)marvell88w8363
$(X86_ONLY)marvell88w8335
$(X86_ONLY)ralink2860 $(X86_ONLY)ralinkwifi $(X86_ONLY)wavelanwifi
+
+ # WiMAX drivers
+ $(GPL_ONLY)usb_beceemwmx
;
#SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
@@ -754,7 +757,6 @@
AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
AddVariableToScript $(script) : installDir : $(HAIKU_INSTALL_DIR) ;
#AddVariableToScript $(script) : isImage : 1 ;
-AddVariableToScript $(script) : gccVersion : $(HAIKU_GCC_VERSION[1]) ;
AddVariableToScript $(script) : imageSize : $(HAIKU_IMAGE_SIZE) ;
AddVariableToScript $(script) : imageLabel : $(HAIKU_IMAGE_LABEL) ;
AddVariableToScript $(script) : addBuildCompatibilityLibDir
Modified: haiku/branches/features/package-management/build/jam/ImageRules
===================================================================
--- haiku/branches/features/package-management/build/jam/ImageRules
2011-03-10 20:11:32 UTC (rev 40905)
+++ haiku/branches/features/package-management/build/jam/ImageRules
2011-03-10 21:21:54 UTC (rev 40906)
@@ -284,17 +284,16 @@
}
rule ExtractArchiveToContainer container : directoryTokens : archiveFile
- : extractedSubDir : isGCCAgnostic
+ : extractedSubDir
{
# ExtractArchiveToContainer <container> : <directory> : <archiveFile>
- # : <extractedSubDir> : <isGCCAgnostic> ;
+ # : <extractedSubDir> ;
local directory = [ AddDirectoryToContainer $(container)
: $(directoryTokens) ] ;
ARCHIVE_FILES_TO_INSTALL on $(directory) += $(archiveFile) ;
ARCHIVE_SUBDIR_TO_INSTALL_FROM on $(archiveFile) = $(extractedSubDir) ;
- ARCHIVE_IS_GCC_AGNOSTIC on $(archiveFile) = $(isGCCAgnostic) ;
}
rule AddDriversToContainer container : relativeDirectoryTokens : targets
@@ -611,11 +610,6 @@
ARCHIVE_SUBDIR_TO_INSTALL_FROM on $(dummyTarget) =
$(extractedSubDir:E=.) ;
- local isGCCAgnostic = [ on $(archiveFile)
- return $(ARCHIVE_IS_GCC_AGNOSTIC) ] ;
- ARCHIVE_IS_GCC_AGNOSTIC on $(dummyTarget) =
- $(isGCCAgnostic:E=false) ;
-
Depends $(dummyTarget) : $(initScript) $(archiveFile)
$(serializationDependency) ;
Depends $(script) : $(dummyTarget) ;
@@ -631,8 +625,7 @@
actions AddExtractFileToContainerExtractFilesScript
{
echo extractFile "\"$(2[2])\"" "\"$(TARGET_DIR)\"" \
- "\"$(ARCHIVE_SUBDIR_TO_INSTALL_FROM)\"" \
- "\"$(ARCHIVE_IS_GCC_AGNOSTIC)\"" >> $(2[1])
+ "\"$(ARCHIVE_SUBDIR_TO_INSTALL_FROM)\"" >> $(2[1])
}
@@ -739,16 +732,16 @@
}
rule ExtractArchiveToHaikuImage dirTokens : archiveFile : alwaysUpdate
- : extractedSubDir : isGCCAgnostic
+ : extractedSubDir
{
# ExtractArchiveToHaikuImage <dirTokens> : <archiveFile> :
<alwaysUpdate>
- # : <extractedSubDir> : <isGCCAgnostic> ;
+ # : <extractedSubDir> ;
# If the image shall only be updated, we extract only, if explicitely
# requested.
if ! [ IsUpdateHaikuImageOnly ] || $(alwaysUpdate) {
ExtractArchiveToContainer $(HAIKU_IMAGE_CONTAINER_NAME) :
$(dirTokens)
- : $(archiveFile) : $(extractedSubDir) :
$(isGCCAgnostic) ;
+ : $(archiveFile) : $(extractedSubDir) ;
}
}
@@ -844,7 +837,6 @@
}
rule InstallOptionalHaikuImagePackage package : url : dirTokens : isCDPackage
- : isGCCAgnostic
{
# download archive file
local archiveFile = [ DownloadFile $(package) : $(url) ] ;
@@ -854,16 +846,9 @@
# image!
# copy onto image
AddFilesToHaikuImage _packages_ : $(archiveFile) ;
- #if $(isGCCAgnostic) {
- # TODO: The archives would need to be marked whether they
are
- # gcc-agnostic (e.g. via attribute). Installer's
UnzipEngine would
- # also need to be updated, to read this attribute and
create the
- # alt gcc dir and symlinks as needed.
- #}
} else {
# extract onto image
- ExtractArchiveToHaikuImage $(dirTokens) : $(archiveFile) : :
- : $(isGCCAgnostic) ;
+ ExtractArchiveToHaikuImage $(dirTokens) : $(archiveFile) ;
}
}
Modified:
haiku/branches/features/package-management/build/jam/OptionalBuildFeatures
===================================================================
--- haiku/branches/features/package-management/build/jam/OptionalBuildFeatures
2011-03-10 20:11:32 UTC (rev 40905)
+++ haiku/branches/features/package-management/build/jam/OptionalBuildFeatures
2011-03-10 21:21:54 UTC (rev 40906)
@@ -129,48 +129,6 @@
= [ FDirName $(HAIKU_ICU_DEVEL_DIR) develop headers 3rdparty ] ;
-# EtPan
-
-# Automatically install the EtPan mail lib, when the optional EtPan optional
-# package is enabled.
-if [ IsOptionalHaikuImagePackageAdded EtPan ] {
- HAIKU_BUILD_FEATURE_ETPAN = 1 ;
-}
-
-HAIKU_ETPAN_GCC_2_PACKAGE = etpan-1.0-x86-gcc2-2010-10-20.zip ;
-HAIKU_ETPAN_GCC_4_PACKAGE = etpan-1.0-x86-gcc4-2010-10-20.zip ;
-
-if $(HAIKU_BUILD_FEATURE_ETPAN) {
- if $(TARGET_ARCH) != x86 {
- Echo "EtPan not available for $(TARGET_ARCH)" ;
- } else {
- local etpan_package ;
- if $(HAIKU_GCC_VERSION[1]) = 2 {
- etpan_package = $(HAIKU_ETPAN_GCC_2_PACKAGE) ;
- } else {
- etpan_package = $(HAIKU_ETPAN_GCC_4_PACKAGE) ;
- }
-
- local zipFile = [ DownloadFile $(etpan_package)
- : $(baseURL)/$(etpan_package) ] ;
-
- # zip file and output directory
- HAIKU_ETPAN_ZIP_FILE = $(zipFile) ;
- HAIKU_ETPAN_DIR = [ FDirName
$(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
- $(etpan_package:B) ] ;
-
- # extract libraries
- HAIKU_ETPAN_LIBS = [ ExtractArchive $(HAIKU_ETPAN_DIR)
- :
- common/lib/libetpan.a
- : $(zipFile)
- ] ;
- HAIKU_ETPAN_HEADERS
- = [ FDirName $(HAIKU_ETPAN_DIR) common include
] ;
- }
-}
-
-
# CLucene
# Automatically install the CLucene feature, when the optional CLucene optional
Modified:
haiku/branches/features/package-management/build/jam/OptionalLibPackages
===================================================================
--- haiku/branches/features/package-management/build/jam/OptionalLibPackages
2011-03-10 20:11:32 UTC (rev 40905)
+++ haiku/branches/features/package-management/build/jam/OptionalLibPackages
2011-03-10 21:21:54 UTC (rev 40906)
@@ -60,9 +60,7 @@
InstallOptionalHaikuImagePackage
box2d-2.1.2-x86-gcc4-2010-10-30.zip
:
$(baseURL)/lib/box2d-2.1.2-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
Echo "No optional package box2d available for
$(TARGET_ARCH)-gcc2" ;
}
@@ -78,16 +76,12 @@
InstallOptionalHaikuImagePackage
fribidi-0.19.2-x86-gcc4-2010-10-30.zip
: $(baseURL)/lib/fribidi-0.19.2-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
fribidi-0.19.2-x86-gcc2-2010-10-29.zip
: $(baseURL)/lib/fribidi-0.19.2-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -100,16 +94,12 @@
InstallOptionalHaikuImagePackage
lcms-2.0a-x86-gcc4-2010-10-30.zip
: $(baseURL)/lib/lcms-2.0a-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
lcms-2.0a-x86-gcc2-2010-10-29.zip
: $(baseURL)/lib/lcms-2.0a-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -122,16 +112,12 @@
InstallOptionalHaikuImagePackage
libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip
:
$(baseURL)/lib/libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip
:
$(baseURL)/lib/libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -144,16 +130,12 @@
InstallOptionalHaikuImagePackage
libmad-0.15.1-x86-gcc4-2010-10-30.zip
: $(baseURL)/lib/libmad-0.15.1-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
libmad-0.15.1-x86-gcc2-2010-10-29.zip
: $(baseURL)/lib/libmad-0.15.1-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -166,16 +148,12 @@
InstallOptionalHaikuImagePackage
libmikmod-3.1.11-x86-gcc4-2010-10-30.zip
:
$(baseURL)/lib/libmikmod-3.1.11-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
:
$(baseURL)/lib/libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -188,16 +166,12 @@
InstallOptionalHaikuImagePackage
libmodplug-0.8.7-x86-gcc4-2010-10-30.zip
:
$(baseURL)/lib/libmodplug-0.8.7-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
libmodplug-0.8.7-x86-gcc2-2010-10-29.zip
:
$(baseURL)/lib/libmodplug-0.8.7-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -210,16 +184,12 @@
InstallOptionalHaikuImagePackage
libpaper-1.1.24-x86-gcc4-2010-10-30.zip
: $(baseURL)/lib/libpaper-1.1.24-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
libpaper-1.1.24-x86-gcc2-2010-10-29.zip
: $(baseURL)/lib/libpaper-1.1.24-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -232,16 +202,12 @@
InstallOptionalHaikuImagePackage
physfs-2.0.1-x86-gcc4-2010-10-30.zip
: $(baseURL)/lib/physfs-2.0.1-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
physfs-2.0.1-x86-gcc2-2010-10-29.zip
: $(baseURL)/lib/physfs-2.0.1-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
Modified:
haiku/branches/features/package-management/build/jam/OptionalPackageDependencies
===================================================================
---
haiku/branches/features/package-management/build/jam/OptionalPackageDependencies
2011-03-10 20:11:32 UTC (rev 40905)
+++
haiku/branches/features/package-management/build/jam/OptionalPackageDependencies
2011-03-10 21:21:54 UTC (rev 40906)
@@ -14,8 +14,8 @@
OptionalPackageDependencies Curl : OpenSSL ;
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
OptionalPackageDependencies Development : DevelopmentBase Perl ;
-OptionalPackageDependencies EtPan : Curl Expat LibIconv OpenSSL ;
OptionalPackageDependencies GetText : LibIconv ;
+OptionalPackageDependencies Curl : OpenSSL ;
OptionalPackageDependencies Git : Expat Curl OpenSSL LibIconv ;
OptionalPackageDependencies ICU-devel : DevelopmentBase ;
OptionalPackageDependencies LibLayout : DevelopmentBase ;
Modified: haiku/branches/features/package-management/build/jam/OptionalPackages
===================================================================
--- haiku/branches/features/package-management/build/jam/OptionalPackages
2011-03-10 20:11:32 UTC (rev 40905)
+++ haiku/branches/features/package-management/build/jam/OptionalPackages
2011-03-10 21:21:54 UTC (rev 40906)
@@ -30,6 +30,7 @@
# DevelopmentBase - basic development environment (gcc,
headers, libs,...)
# DevelopmentJava - JamVM, a Java Virtual machine, GNU
Classpath, ECJ
# DevelopmentMin - development headers, libs, tools,
from sources only
+# Doxygen - Generate documentation from
source code
# Expat - XML parsing libraries
# Fastdep - fast dependency generator for
C/C++ files
# friss - RSS/ATOM/... feeds reader
@@ -94,8 +95,7 @@
} else {
InstallOptionalHaikuImagePackage
ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip
- :
$(baseURL)/ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip
- ;
+ :
$(baseURL)/ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip ;
}
}
@@ -140,9 +140,7 @@
Echo "No optional package ArmyKnife for gcc4" ;
} else {
InstallOptionalHaikuImagePackage
armyknife-61-x86-gcc2-2010-10-30.zip
- : $(baseURL)/armyknife-61-x86-gcc2-2010-10-30.zip
- :
- ;
+ : $(baseURL)/armyknife-61-x86-gcc2-2010-10-30.zip ;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/ArmyKnife/ArmyKnife ;
}
@@ -155,14 +153,10 @@
Echo "No optional package Bazaar available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage bzr-2.2.0-gcc4-2010-09-15.zip
- : $(baseURL)/bzr-2.2.0-x86-gcc4-2010-09-15.zip
- :
- ;
+ : $(baseURL)/bzr-2.2.0-x86-gcc4-2010-09-15.zip ;
} else {
InstallOptionalHaikuImagePackage
bzr-2.2.1-x86-gcc2-2010-10-16.zip
- : $(baseURL)/bzr-2.2.1-x86-gcc2-2010-10-16.zip
- :
- ;
+ : $(baseURL)/bzr-2.2.1-x86-gcc2-2010-10-16.zip ;
}
}
@@ -171,18 +165,14 @@
if [ IsOptionalHaikuImagePackageAdded BeAE ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package BeAE available for $(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage beae-22-x86-gcc4-2010-09-15.zip
- : $(baseURL)/beae-22-x86-gcc4-2010-09-15.zip
- :
- ;
- AddSymlinkToHaikuImage home config be Applications
- : /boot/apps/BeAE/BeAE ;
} else {
- InstallOptionalHaikuImagePackage beae-22-x86-gcc2-2010-09-15.zip
- : $(baseURL)/beae-22-x86-gcc2-2010-09-15.zip
- :
- ;
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
beae-22-x86-gcc4-2010-09-15.zip
+ : $(baseURL)/beae-22-x86-gcc4-2010-09-15.zip ;
+ } else {
+ InstallOptionalHaikuImagePackage
beae-22-x86-gcc2-2010-09-15.zip
+ : $(baseURL)/beae-22-x86-gcc2-2010-09-15.zip ;
+ }
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BeAE/BeAE ;
}
@@ -197,8 +187,7 @@
Echo "No optional package Beam available for gcc4" ;
} else {
InstallOptionalHaikuImagePackage
Beam-1.2alpha-x86-gcc2-2010-04-29.zip
- : $(baseURL)/Beam-1.2alpha-x86-gcc2-2010-04-29.zip
- ;
+ : $(baseURL)/Beam-1.2alpha-x86-gcc2-2010-04-29.zip ;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Beam/Beam ;
}
@@ -209,8 +198,7 @@
if [ IsOptionalHaikuImagePackageAdded BeBook ] {
InstallOptionalHaikuImagePackage bebook_20081026.zip
: $(baseURL)/bebook_20081026.zip
- : system documentation
- ;
+ : system documentation ;
AddSymlinkToHaikuImage home Desktop
: /boot/system/documentation/bebook/index.html
: BeBook ;
@@ -225,9 +213,7 @@
Echo "No optional package BeHappy available for gcc4" ;
} else {
InstallOptionalHaikuImagePackage
BeHappy-1.0.6-x86-gcc2-2008-10-16.zip
- : $(baseURL)/BeHappy-1.0.6-x86-gcc2-2008-10-16.zip
- :
- ;
+ : $(baseURL)/BeHappy-1.0.6-x86-gcc2-2008-10-16.zip ;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BeHappy/BeHappy ;
}
@@ -266,8 +252,7 @@
InstallOptionalHaikuImagePackage
BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-08.zip
: $(baseURL)/BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-08.zip
- : apps
- ;
+ : apps ;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BePDF/BePDF ;
AddSymlinkToHaikuImage common data licenses
@@ -290,22 +275,16 @@
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc4-2010-05-04.zip
- :
$(baseURL)/BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc4-2010-05-04.zip
- :
- ;
+ :
$(baseURL)/BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc4-2010-05-04.zip ;
} else {
InstallOptionalHaikuImagePackage
BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc2-2010-05-02.zip
- :
$(baseURL)/BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc2-2010-05-02.zip
- :
- ;
+ :
$(baseURL)/BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc2-2010-05-02.zip ;
}
AddSymlinkToHaikuImage home config be Applications
- : /boot/apps/BeZillaBrowser/BeZillaBrowser
- ;
+ : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
InstallSourceArchive
BeZillaBrowser-2.0.0.22pre-r1a2-sources.tar.xz
- :
$(baseSourceURL)/2010/BeZillaBrowser-2.0.0.22pre-r1a2-sources.tar.xz
- ;
+ :
$(baseSourceURL)/2010/BeZillaBrowser-2.0.0.22pre-r1a2-sources.tar.xz ;
}
}
@@ -339,18 +318,14 @@
if [ IsOptionalHaikuImagePackageAdded BurnItNow ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package BurnItNow available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
burnitnow-39-x86-gcc4-2010-09-15.zip
- : $(baseURL)/burnitnow-39-x86-gcc4-2010-09-15.zip
- :
- ;
- AddSymlinkToHaikuImage home config be Applications
- : /boot/apps/BurnItNow/BurnItNow ;
} else {
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
burnitnow-39-x86-gcc4-2010-09-15.zip
+ :
$(baseURL)/burnitnow-39-x86-gcc4-2010-09-15.zip ;
+ } else {
InstallOptionalHaikuImagePackage
burnitnow-39-x86-gcc2-2010-09-15.zip
- : $(baseURL)/burnitnow-39-x86-gcc2-2010-09-15.zip
- :
- ;
+ : $(baseURL)/burnitnow-39-x86-gcc2-2010-09-15.zip ;
+ }
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BurnItNow/BurnItNow ;
}
@@ -365,9 +340,7 @@
InstallOptionalHaikuImagePackage
bzip2-1.0.6-x86-gcc2-2010-09-21.zip
: $(baseURL)/bzip2-1.0.6-x86-gcc2-2010-09-21.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -379,9 +352,7 @@
} else {
InstallOptionalHaikuImagePackage
ccache-3.0.1-x86-gcc2-2010-08-30.zip
- : $(baseURL)/ccache-3.0.1-x86-gcc2-2010-08-30.zip
- :
- ;
+ : $(baseURL)/ccache-3.0.1-x86-gcc2-2010-08-30.zip ;
}
}
@@ -404,20 +375,16 @@
if [ IsOptionalHaikuImagePackageAdded Clockwerk ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Clockwerk available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
- Clockwerk-0.0.2-x86-gcc4-2010-10-13-1.zip
- : $(baseURL)/Clockwerk-0.0.2-x86-gcc4-2010-10-13-1.zip
- :
- ;
- AddSymlinkToHaikuImage home config be Applications
- : /boot/apps/Clockwerk/Clockwerk ;
} else {
- InstallOptionalHaikuImagePackage
- Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip
- : $(baseURL)/Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip
- :
- ;
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ Clockwerk-0.0.2-x86-gcc4-2010-10-13-1.zip
+ :
$(baseURL)/Clockwerk-0.0.2-x86-gcc4-2010-10-13-1.zip ;
+ } else {
+ InstallOptionalHaikuImagePackage
+ Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip
+ :
$(baseURL)/Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip ;
+ }
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Clockwerk/Clockwerk ;
}
@@ -434,9 +401,7 @@
InstallOptionalHaikuImagePackage
clucene-0.9.21-x86-gcc4-haiku-2009-08-11.zip
:
$(baseURL)/clucene-0.9.21-x86-gcc4-haiku-2009-08-11.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -450,16 +415,12 @@
InstallOptionalHaikuImagePackage
cmake-2.8.4-x86-gcc4-2011-02-25.zip
: $(baseURL)/cmake-2.8.4-x86-gcc4-2011-02-25.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
cmake-2.8.4-x86-gcc2-2011-02-25.zip
: $(baseURL)/cmake-2.8.4-x86-gcc2-2011-02-25.zip
- :
- : true
- ;
+ : : true ;
}
}
}
@@ -471,12 +432,10 @@
Echo "No optional package Curl available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
curl-7.21.4-x86-gcc4-2011-02-28.zip
- : $(baseURL)/curl-7.21.4-x86-gcc4-2011-02-28.zip
- : : true ;
+ : $(baseURL)/curl-7.21.4-x86-gcc4-2011-02-28.zip ;
} else {
InstallOptionalHaikuImagePackage
curl-7.21.4-x86-gcc2-2011-02-28.zip
- : $(baseURL)/curl-7.21.4-x86-gcc2-2011-02-28.zip
- : : true ;
+ : $(baseURL)/curl-7.21.4-x86-gcc2-2011-02-28.zip ;
}
}
@@ -497,7 +456,6 @@
:
$(baseURL)/cvs-1.12.13-r1a2-x86-gcc2-2010-04-29-a.zip
: : true ;
}
-
InstallSourceArchive cvs-1.12.13_haiku-2010-04-29.tar.xz
:
$(baseSourceURL)/2010/cvs-1.12.13_haiku-2010-04-29.tar.xz ;
}
@@ -538,11 +496,9 @@
}
InstallSourceArchive automake-1.11.1_haiku-2010-04-29.tar.xz
- : $(baseSourceURL)/2010/automake-1.11.1_haiku-2010-04-29.tar.xz
- ;
+ : $(baseSourceURL)/2010/automake-1.11.1_haiku-2010-04-29.tar.xz
;
InstallSourceArchive texinfo-4.13a_haiku-2010-04-29.tar.xz
- : $(baseSourceURL)/2010/texinfo-4.13a_haiku-2010-04-29.tar.xz
- ;
+ : $(baseSourceURL)/2010/texinfo-4.13a_haiku-2010-04-29.tar.xz ;
}
@@ -622,8 +578,8 @@
AddSymlinkToHaikuImage common bin
: /boot/common/bin/jamvm : java ;
InstallOptionalHaikuImagePackage
- ecj-3.6.2-haiku-2011-02-26.zip
- : $(baseURL)/ecj-3.6.2-haiku-2011-02-26.zip ;
+ ecj-3.6.2-haiku-2011-03-05.zip
+ : $(baseURL)/ecj-3.6.2-haiku-2011-03-05.zip ;
} else {
Echo "No optional package DevelopmentJava available for gcc2" ;
}
@@ -724,12 +680,31 @@
}
+# Doxygen
+if [ IsOptionalHaikuImagePackageAdded Doxygen ] {
+ if $(TARGET_ARCH) != x86 {
+ Echo "No optional package Doxygen available for $(TARGET_ARCH)"
;
+ } else {
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ doxygen-1.6.3-x86-gcc4-2010-05-17.zip
+ :
$(baseURL)/doxygen-1.6.3-x86-gcc4-2010-05-17.zip
+ : : true ;
+ } else {
+ InstallOptionalHaikuImagePackage
+ doxygen-1.6.3-x86-gcc2-2010-05-17.zip
+ :
$(baseURL)/doxygen-1.6.3-x86-gcc2-2010-05-17.zip
+ : : true ;
+ }
+ }
+}
+
+
# Expat
if [ IsOptionalHaikuImagePackageAdded Expat ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Expat available for $(TARGET_ARCH)" ;
} else {
-
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
expat-2.0.1-x86-gcc4-2010-11-12.zip
@@ -741,7 +716,6 @@
:
$(baseURL)/expat-2.0.1-r1a2-x86-gcc2-2010-04-22-a.zip
: : true ;
}
-
InstallSourceArchive expat-2.0.1_haiku-2010-04-29.tar.xz
:
$(baseSourceURL)/2010/expat-2.0.1_haiku-2010-04-29.tar.xz ;
}
@@ -755,9 +729,7 @@
} else {
InstallOptionalHaikuImagePackage
fastdep-0.16-x86-gcc2-2010-09-02.zip
- : $(baseURL)/fastdep-0.16-x86-gcc2-2010-09-02.zip
- :
- ;
+ : $(baseURL)/fastdep-0.16-x86-gcc2-2010-09-02.zip ;
}
}
@@ -768,10 +740,8 @@
Echo "No optional package friss available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage friss-0.5pre7-x86-gcc4.zip
- :
http://pulkomandy.ath.cx/projects/friss/export/8/bin/friss-0.5pre7-x86-gcc4.zip
- :
- : true
- ;
+ : $(baseURL)/friss-0.5pre7-x86-gcc4.zip
+ : : true ;
} else {
Echo "No optional package friss available for gcc2" ;
}
@@ -787,23 +757,15 @@
InstallOptionalHaikuImagePackage
gettext-0.18.1.1-x86-gcc4-2011-02-07.zip
:
$(baseURL)/gettext-0.18.1.1-x86-gcc4-2011-02-07.zip
- :
- : true
- ;
- InstallSourceArchive
gettext-0.18.1.1_haiku-2011-02-07.tar.xz
- :
$(baseSourceURL)/2010/gettext-0.18.1.1_haiku-2011-02-07.tar.xz ;
- } else if $(HAIKU_GCC_VERSION[1]) = 2 {
+ : : true ;
+ } else {
InstallOptionalHaikuImagePackage
gettext-0.18.1.1-x86-gcc2-2011-02-07.zip
:
$(baseURL)/gettext-0.18.1.1-x86-gcc2-2011-02-07.zip
- :
- : true
- ;
- InstallSourceArchive
gettext-0.18.1.1_haiku-2011-02-07.tar.xz
- :
$(baseSourceURL)/2011/gettext-0.18.1.1_haiku-2011-02-07.tar.xz ;
- } else {
- Echo "No optional package GetText available for
$(TARGET_ARCH)-gcc2" ;
+ : : true ;
}
+ InstallSourceArchive gettext-0.18.1.1_haiku-2011-02-07.tar.xz
+ :
$(baseSourceURL)/2010/gettext-0.18.1.1_haiku-2011-02-07.tar.xz ;
}
}
@@ -816,9 +778,7 @@
InstallOptionalHaikuImagePackage
git-1.7.1-x86-gcc2-2010-05-26.zip
: $(baseURL)/git-1.7.1-x86-gcc2-2010-05-26.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -832,16 +792,12 @@
InstallOptionalHaikuImagePackage
gperf-3.0.4-x86-gcc4-2010-06-15.zip
: $(baseURL)/gperf-3.0.4-x86-gcc4-2010-06-15.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
gperf-3.0.4-x86-gcc2-2010-06-15.zip
: $(baseURL)/gperf-3.0.4-x86-gcc2-2010-06-15.zip
- :
- : true
- ;
+ : : true ;
}
}
}
@@ -854,9 +810,7 @@
} else {
InstallOptionalHaikuImagePackage
groff-1.20.1-x86-gcc2-2010-08-31.zip
- : $(baseURL)/groff-1.20.1-x86-gcc2-2010-08-31.zip
- :
- ;
+ : $(baseURL)/groff-1.20.1-x86-gcc2-2010-08-31.zip ;
}
}
@@ -884,8 +838,7 @@
# ICU-devel
if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
InstallOptionalHaikuImagePackage $(HAIKU_ICU_DEVEL_PACKAGE)
- : $(baseURL)/$(HAIKU_ICU_DEVEL_PACKAGE)
- ;
+ : $(baseURL)/$(HAIKU_ICU_DEVEL_PACKAGE) ;
local arch = $(TARGET_ARCH) ;
local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
@@ -904,20 +857,16 @@
if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package KeymapSwitcher available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
- KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip
- :
$(baseURL)/KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip
- :
- ;
- AddSymlinkToHaikuImage home config be Desktop\ applets
- : /boot/common/bin/KeymapSwitcher ;
} else {
- InstallOptionalHaikuImagePackage
- KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip
- :
$(baseURL)/KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip
- :
- ;
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip
+ :
$(baseURL)/KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip ;
+ } else {
+ InstallOptionalHaikuImagePackage
+ KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip
+ :
$(baseURL)/KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip ;
+ }
AddSymlinkToHaikuImage home config be Desktop\ applets
: /boot/common/bin/KeymapSwitcher ;
}
@@ -933,16 +882,12 @@
InstallOptionalHaikuImagePackage
libevent-2.0.10-x86-gcc4-2011-02-28.zip
:
$(baseURL)/lib/libevent-2.0.10-x86-gcc4-2011-02-28.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
libevent-2.0.10-x86-gcc2-2011-02-25.zip
:
$(baseURL)/lib/libevent-2.0.10-x86-gcc2-2011-02-25.zip
- :
- : true
- ;
+ : : true ;
}
}
}
@@ -962,7 +907,6 @@
libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21-a.zip
:
$(baseURL)/libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21-a.zip ;
}
-
InstallSourceArchive libiconv-1.13.1_haiku-2010-04-29.tar.xz
:
$(baseSourceURL)/2010/libiconv-1.13.1_haiku-2010-04-29.tar.xz ;
}
@@ -977,9 +921,7 @@
Echo "No optional package LibLayout available for gcc4" ;
} else {
InstallOptionalHaikuImagePackage
liblayout-1.4.0-gcc2-2009-03-08.zip
- : $(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip
- :
- ;
+ : $(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip ;
}
}
@@ -990,14 +932,10 @@
Echo "No optional package Libmng available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
libmng-1.0.10-x86-gcc4-2010-10-30.zip
- : $(baseURL)/lib/libmng-1.0.10-x86-gcc4-2010-10-30.zip
- :
- ;
+ : $(baseURL)/lib/libmng-1.0.10-x86-gcc4-2010-10-30.zip ;
} else {
InstallOptionalHaikuImagePackage
libmng-1.0.10-x86-gcc2-2010-10-29.zip
- : $(baseURL)/lib/libmng-1.0.10-x86-gcc2-2010-10-29.zip
- :
- ;
+ : $(baseURL)/lib/libmng-1.0.10-x86-gcc2-2010-10-29.zip ;
}
}
@@ -1016,7 +954,6 @@
libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22-a.zip
:
$(baseURL)/libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22-a.zip ;
}
-
InstallSourceArchive libxml2-2.7.7_haiku-2010-04-29.tar.xz
:
$(baseSourceURL)/2010/libxml2-2.7.7_haiku-2010-04-29.tar.xz ;
}
@@ -1031,9 +968,7 @@
InstallOptionalHaikuImagePackage
libxslt-1.1.26-r1a2-x86-gcc2-2010-04-22-a.zip
:
$(baseURL)/libxslt-1.1.26-r1a2-x86-gcc2-2010-04-22-a.zip
- :
- : true
- ;
+ : : true ;
InstallSourceArchive libxslt-1.1.26_haiku-2010-04-29.tar.xz
:
$(baseSourceURL)/2010/libxslt-1.1.26_haiku-2010-04-29.tar.xz ;
}
@@ -1048,9 +983,7 @@
Echo "No optional package Links available for gcc4" ;
} else {
InstallOptionalHaikuImagePackage Links.zip
- : $(baseURL)/links-x86-gcc2-2008-05-03.zip
- :
- ;
+ : $(baseURL)/links-x86-gcc2-2008-05-03.zip ;
AddSymlinkToHaikuImage home config be Applications
: /boot/home/config/bin/links ;
}
@@ -1066,16 +999,12 @@
InstallOptionalHaikuImagePackage
lua-5.1.4-x86-gcc4-2010-10-31.zip
: $(baseURL)/lua-5.1.4-x86-gcc4-2010-10-31.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
lua-5.1.4-x86-gcc2-2010-10-29.zip
: $(baseURL)/lua-5.1.4-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
}
@@ -1088,9 +1017,7 @@
} else {
InstallOptionalHaikuImagePackage
man-1.6f-x86-gcc2-2010-09-01.zip
- : $(baseURL)/man-1.6f-x86-gcc2-2010-09-01.zip
- :
- ;
+ : $(baseURL)/man-1.6f-x86-gcc2-2010-09-01.zip ;
}
}
@@ -1196,9 +1123,7 @@
Echo "No optional package NetSurf available for gcc4" ;
} else {
InstallOptionalHaikuImagePackage
netsurf-2.6-x86.gcc2-2010-09-26.zip
- : $(baseURL)/netsurf-2.6-x86-gcc2-2010-09-26.zip
- :
- ;
+ : $(baseURL)/netsurf-2.6-x86-gcc2-2010-09-26.zip ;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/netsurf/NetSurf ;
}
@@ -1214,14 +1139,10 @@
} else {
InstallOptionalHaikuImagePackage
ocaml-3.11.1-r1a1-x86-gcc2-2009-09-06.zip
- : $(baseURL)/ocaml-3.11.1-r1a1-x86-gcc2-2009-09-06.zip
- :
- ;
+ : $(baseURL)/ocaml-3.11.1-r1a1-x86-gcc2-2009-09-06.zip ;
InstallOptionalHaikuImagePackage
camlp5-5.12-r1a1-x86-gcc2-2009-09-06.zip
- : $(baseURL)/camlp5-5.12-r1a1-x86-gcc2-2009-09-06.zip
- :
- ;
+ : $(baseURL)/camlp5-5.12-r1a1-x86-gcc2-2009-09-06.zip ;
}
}
@@ -1233,11 +1154,8 @@
} else {
InstallOptionalHaikuImagePackage
opensound-4.2-r1a2-x86-gcc2-2010-05-01.zip
- : $(baseURL)/opensound-4.2-r1a2-x86-gcc2-2010-05-01.zip
- :
[... truncated: 23353 lines follow ...]
Other related posts:
- » [haiku-commits] r40906 - in haiku/branches/features/package-management: . build/jam build/scripts data/bin data/catalogs/add-ons/disk_systems/bfs ... - zooey
