added 1 changeset to branch 'refs/remotes/HaikuPM-github/package-management' old head: 6185f6e7cc2c1df89a32b9fc82a315b69ae98629 new head: 88f22c9768e3a7d5bd439800b2f6d479a369d745 overview: https://github.com/haiku/HaikuPM/compare/6185f6e...88f22c9 ---------------------------------------------------------------------------- 88f22c9: InstallOptionalHaikuImagePackage: Remove first parameter Instead deduce the file name from the URL. A long overdue change. Avoids unnecessary name duplication, which only led to errors. [ Ingo Weinhold <ingo_weinhold@xxxxxx> ] ---------------------------------------------------------------------------- Commit: 88f22c9768e3a7d5bd439800b2f6d479a369d745 Author: Ingo Weinhold <ingo_weinhold@xxxxxx> Date: Tue Apr 16 12:39:31 2013 UTC ---------------------------------------------------------------------------- 3 files changed, 237 insertions(+), 430 deletions(-) build/jam/ImageRules | 4 +- build/jam/OptionalLibPackages | 183 +++++---------- build/jam/OptionalPackages | 480 ++++++++++++++------------------------ ---------------------------------------------------------------------------- diff --git a/build/jam/ImageRules b/build/jam/ImageRules index 0b0a347..2420a1e 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -920,8 +920,10 @@ rule InstallSourceArchive file : url } } -rule InstallOptionalHaikuImagePackage package : url : dirTokens : isCDPackage +rule InstallOptionalHaikuImagePackage url : dirTokens : isCDPackage { + local package = $(url:BS) ; + # download archive file local archiveFile = [ DownloadFile $(package) : $(url) ] ; diff --git a/build/jam/OptionalLibPackages b/build/jam/OptionalLibPackages index 1a56812..56d45a0 100644 --- a/build/jam/OptionalLibPackages +++ b/build/jam/OptionalLibPackages @@ -29,24 +29,18 @@ if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] { Echo "No optional package AllegroLibs available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - allegro-4.4.1.1-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/allegro-4.4.1.1-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/allegro-4.4.1.1-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - dumb-0.9.3-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/dumb-0.9.3-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/dumb-0.9.3-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - jgmod-0.99-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/jgmod-0.99-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/jgmod-0.99-r1a3-x86-gcc4-2011-05-26.zip ; } else { InstallOptionalHaikuImagePackage - allegro-4.4.1.1-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/allegro-4.4.1.1-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/allegro-4.4.1.1-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - dumb-0.9.3-x86-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/dumb-0.9.3-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/dumb-0.9.3-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - jgmod-0.99-x86-gcc2-2011-08-02.zip - : $(baseURL)/lib/jgmod-0.99-x86-gcc2-2011-08-02.zip ; + $(baseURL)/lib/jgmod-0.99-x86-gcc2-2011-08-02.zip ; } } @@ -58,8 +52,7 @@ if [ IsOptionalHaikuImagePackageAdded box2d ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - box2d-2.1.2-r1a3-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/box2d-2.1.2-r1a3-x86-gcc4-2011-05-26.zip + $(baseURL)/lib/box2d-2.1.2-r1a3-x86-gcc4-2011-05-26.zip : : true ; } else { Echo "No optional package box2d available for $(TARGET_ARCH)-gcc2" ; @@ -74,13 +67,11 @@ if [ IsOptionalHaikuImagePackageAdded fribidi ] { Echo "No optional package fribidi available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - fribidi-0.19.2-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/fribidi-0.19.2-r1a3-x86-gcc4-2011-05-26.zip + $(baseURL)/lib/fribidi-0.19.2-r1a3-x86-gcc4-2011-05-26.zip : : true ; } else { InstallOptionalHaikuImagePackage - fribidi-0.19.2-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/fribidi-0.19.2-r1a3-x86-gcc2-2011-05-19.zip + $(baseURL)/lib/fribidi-0.19.2-r1a3-x86-gcc2-2011-05-19.zip : : true ; } } @@ -92,13 +83,11 @@ if [ IsOptionalHaikuImagePackageAdded lcms ] { Echo "No optional package lcms available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - lcms-2.1-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/lcms-2.1-r1a3-x86-gcc4-2011-05-26.zip + $(baseURL)/lib/lcms-2.1-r1a3-x86-gcc4-2011-05-26.zip : : true ; } else { InstallOptionalHaikuImagePackage - lcms-2.1-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/lcms-2.1-r1a3-x86-gcc2-2011-05-19.zip + $(baseURL)/lib/lcms-2.1-r1a3-x86-gcc2-2011-05-19.zip : : true ; } } @@ -110,13 +99,11 @@ if [ IsOptionalHaikuImagePackageAdded libart_lgpl ] { Echo "No optional package libart_lgpl available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libart_lgpl-2.3.21-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libart_lgpl-2.3.21-r1a3-x86-gcc4-2011-05-26.zip + $(baseURL)/lib/libart_lgpl-2.3.21-r1a3-x86-gcc4-2011-05-26.zip : : true ; } else { InstallOptionalHaikuImagePackage - libart_lgpl-2.3.21-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libart_lgpl-2.3.21-r1a3-x86-gcc2-2011-05-19.zip + $(baseURL)/lib/libart_lgpl-2.3.21-r1a3-x86-gcc2-2011-05-19.zip : : true ; } } @@ -128,13 +115,11 @@ if [ IsOptionalHaikuImagePackageAdded libmad ] { Echo "No optional package libmad available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libmad-0.15.1b-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libmad-0.15.1b-r1a3-x86-gcc4-2011-05-26.zip + $(baseURL)/lib/libmad-0.15.1b-r1a3-x86-gcc4-2011-05-26.zip : : true ; } else { InstallOptionalHaikuImagePackage - libmad-0.15.1b-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libmad-0.15.1b-r1a3-x86-gcc2-2011-05-19.zip + $(baseURL)/lib/libmad-0.15.1b-r1a3-x86-gcc2-2011-05-19.zip : : true ; } } @@ -146,13 +131,11 @@ if [ IsOptionalHaikuImagePackageAdded libmikmod ] { Echo "No optional package libmikmod available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libmikmod-3.1.11-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libmikmod-3.1.11-r1a3-x86-gcc4-2011-05-26.zip + $(baseURL)/lib/libmikmod-3.1.11-r1a3-x86-gcc4-2011-05-26.zip : : true ; } else { InstallOptionalHaikuImagePackage - libmikmod-3.1.11-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libmikmod-3.1.11-r1a3-x86-gcc2-2011-05-19.zip + $(baseURL)/lib/libmikmod-3.1.11-r1a3-x86-gcc2-2011-05-19.zip : : true ; } } @@ -164,13 +147,11 @@ if [ IsOptionalHaikuImagePackageAdded libmodplug ] { Echo "No optional package libmodplug available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libmodplug-0.8.8.1-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libmodplug-0.8.8.1-r1a3-x86-gcc4-2011-05-26.zip + $(baseURL)/lib/libmodplug-0.8.8.1-r1a3-x86-gcc4-2011-05-26.zip : : true ; } else { InstallOptionalHaikuImagePackage - libmodplug-0.8.8.1-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libmodplug-0.8.8.1-r1a3-x86-gcc2-2011-05-19.zip + $(baseURL)/lib/libmodplug-0.8.8.1-r1a3-x86-gcc2-2011-05-19.zip : : true ; } } @@ -182,13 +163,11 @@ if [ IsOptionalHaikuImagePackageAdded libpaper ] { Echo "No optional package libpaper available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libpaper-1.1.24-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libpaper-1.1.24-r1a3-x86-gcc4-2011-05-26.zip + $(baseURL)/lib/libpaper-1.1.24-r1a3-x86-gcc4-2011-05-26.zip : : true ; } else { InstallOptionalHaikuImagePackage - libpaper-1.1.24-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libpaper-1.1.24-r1a3-x86-gcc2-2011-05-19.zip + $(baseURL)/lib/libpaper-1.1.24-r1a3-x86-gcc2-2011-05-19.zip : : true ; } } @@ -200,13 +179,11 @@ if [ IsOptionalHaikuImagePackageAdded physfs ] { Echo "No optional package physfs available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - physfs-2.0.1-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/physfs-2.0.1-r1a3-x86-gcc4-2011-05-26.zip + $(baseURL)/lib/physfs-2.0.1-r1a3-x86-gcc4-2011-05-26.zip : : true ; } else { InstallOptionalHaikuImagePackage - physfs-2.0.1-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/physfs-2.0.1-r1a3-x86-gcc2-2011-05-19.zip + $(baseURL)/lib/physfs-2.0.1-r1a3-x86-gcc2-2011-05-19.zip : : true ; } } @@ -218,78 +195,54 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] { Echo "No optional package SDLLibs available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libsdl-1.2-hg-r1a3-x86-gcc4-2011-05-29.zip - : $(baseURL)/lib/libsdl-1.2-hg-r1a3-x86-gcc4-2011-05-29.zip ; + $(baseURL)/lib/libsdl-1.2-hg-r1a3-x86-gcc4-2011-05-29.zip ; InstallOptionalHaikuImagePackage - guilib-1.2.1-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/guilib-1.2.1-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/guilib-1.2.1-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - sdl-gfx-2.0.22-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/sdl-gfx-2.0.22-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/sdl-gfx-2.0.22-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - sdl-image-1.2.10-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/sdl-image-1.2.10-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/sdl-image-1.2.10-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - sdl-mixer-1.2.11-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/sdl-mixer-1.2.11-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/sdl-mixer-1.2.11-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - sdl-net-1.2.7-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/sdl-net-1.2.7-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/sdl-net-1.2.7-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - sdl-sound-1.0.3-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/sdl-sound-1.0.3-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/sdl-sound-1.0.3-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - sdl-rtf-0.1.0-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/sdl-rtf-0.1.0-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/sdl-rtf-0.1.0-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - sdl-ttf-2.0.10-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/sdl-ttf-2.0.10-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/sdl-ttf-2.0.10-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - sge-030809-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/sge-030809-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/sge-030809-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - smjpeg-0.2.1-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/smjpeg-0.2.1-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/smjpeg-0.2.1-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - smpeg-0.4.5-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/smpeg-0.4.5-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/smpeg-0.4.5-r1a3-x86-gcc4-2011-05-26.zip ; } else { InstallOptionalHaikuImagePackage - libsdl-1.2-hg-r1a3-x86-gcc2-2011-05-29.zip - : $(baseURL)/lib/libsdl-1.2-hg-r1a3-x86-gcc2-2011-05-29.zip ; + $(baseURL)/lib/libsdl-1.2-hg-r1a3-x86-gcc2-2011-05-29.zip ; InstallOptionalHaikuImagePackage - guilib-1.2.1-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/guilib-1.2.1-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/guilib-1.2.1-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - sdl-gfx-2.0.22-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/sdl-gfx-2.0.22-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/sdl-gfx-2.0.22-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - sdl-image-1.2.10-x86-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/sdl-image-1.2.10-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/sdl-image-1.2.10-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - sdl-mixer-1.2.11-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/sdl-mixer-1.2.11-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/sdl-mixer-1.2.11-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - sdl-net-1.2.7-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/sdl-net-1.2.7-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/sdl-net-1.2.7-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - sdl-sound-1.0.3-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/sdl-sound-1.0.3-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/sdl-sound-1.0.3-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - sdl-rtf-0.1.0-r1a3-x86-gcc2-2011-05-20.zip - : $(baseURL)/lib/sdl-rtf-0.1.0-r1a3-x86-gcc2-2011-05-20.zip ; + $(baseURL)/lib/sdl-rtf-0.1.0-r1a3-x86-gcc2-2011-05-20.zip ; InstallOptionalHaikuImagePackage - sdl-ttf-2.0.10-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/sdl-ttf-2.0.10-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/sdl-ttf-2.0.10-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - sge-030809-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/sge-030809-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/sge-030809-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - smjpeg-0.2.1-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/smjpeg-0.2.1-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/smjpeg-0.2.1-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - smpeg-0.4.5-r1a3-x86-gcc2-2011-05-20.zip - : $(baseURL)/lib/smpeg-0.4.5-r1a3-x86-gcc2-2011-05-20.zip ; + $(baseURL)/lib/smpeg-0.4.5-r1a3-x86-gcc2-2011-05-20.zip ; } } @@ -300,48 +253,34 @@ if [ IsOptionalHaikuImagePackageAdded XiphLibs ] { Echo "No optional package XiphLibs available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - flac-1.2.1-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/flac-1.2.1-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/flac-1.2.1-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - libao-1.0.0-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libao-1.0.0-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/libao-1.0.0-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - libogg-1.2.2-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libogg-1.2.2-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/libogg-1.2.2-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - libtheora-1.1.1-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libtheora-1.1.1-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/libtheora-1.1.1-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - libvorbis-1.3.2-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libvorbis-1.3.2-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/libvorbis-1.3.2-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - speex-1.2-git-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/speex-1.2-git-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/speex-1.2-git-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - vorbis-tools-1.4.0-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/vorbis-tools-1.4.0-r1a3-x86-gcc4-2011-05-26.zip ; + $(baseURL)/lib/vorbis-tools-1.4.0-r1a3-x86-gcc4-2011-05-26.zip ; } else { InstallOptionalHaikuImagePackage - flac-1.2.1-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/flac-1.2.1-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/flac-1.2.1-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - libao-1.0.0-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libao-1.0.0-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/libao-1.0.0-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - libogg-1.2.2-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libogg-1.2.2-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/libogg-1.2.2-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - libtheora-1.1.1-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libtheora-1.1.1-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/libtheora-1.1.1-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - libvorbis-1.3.2-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libvorbis-1.3.2-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/libvorbis-1.3.2-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - speex-1.2-git-r1a3-x86-gcc2-2011-05-26.zip - : $(baseURL)/lib/speex-1.2-git-r1a3-x86-gcc2-2011-05-26.zip ; + $(baseURL)/lib/speex-1.2-git-r1a3-x86-gcc2-2011-05-26.zip ; InstallOptionalHaikuImagePackage - vorbis-tools-1.4.0-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/vorbis-tools-1.4.0-r1a3-x86-gcc2-2011-05-19.zip ; + $(baseURL)/lib/vorbis-tools-1.4.0-r1a3-x86-gcc2-2011-05-19.zip ; } } diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 3f84fc3..d316369 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -97,8 +97,7 @@ if [ IsOptionalHaikuImagePackageAdded ABI-compliance-checker ] { Echo "No optional package ABI-compliance-checker for gcc2" ; } 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 ; } } @@ -109,13 +108,11 @@ if [ IsOptionalHaikuImagePackageAdded APR ] { Echo "No optional package APR available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - apr-1.4.2-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/apr-1.4.2-r1a3-x86-gcc4-2011-05-24.zip + $(baseURL)/apr-1.4.2-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage - apr-1.4.2-3-x86_gcc2.hpkg - : $(hpkgBaseURL)/apr-1.4.2-3-x86_gcc2.hpkg + $(hpkgBaseURL)/apr-1.4.2-3-x86_gcc2.hpkg : common packages ; } } @@ -127,13 +124,11 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] { Echo "No optional package APR-util available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - apr-util-1.3.10-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/apr-util-1.3.10-r1a3-x86-gcc4-2011-05-24.zip + $(baseURL)/apr-util-1.3.10-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage - apr-util-1.3.10-3-x86_gcc2.hpkg - : $(hpkgBaseURL)/apr-util-1.3.10-3-x86_gcc2.hpkg + $(hpkgBaseURL)/apr-util-1.3.10-3-x86_gcc2.hpkg : common packages ; } } @@ -147,8 +142,7 @@ if [ IsOptionalHaikuImagePackageAdded ArmyKnife ] { Echo "No optional package ArmyKnife for gcc4" ; } else { InstallOptionalHaikuImagePackage - armyknife-63-r1a3-x86-gcc2-2011-06-04.zip - : $(baseURL)/armyknife-63-r1a3-x86-gcc2-2011-06-04.zip ; + $(baseURL)/armyknife-63-r1a3-x86-gcc2-2011-06-04.zip ; AddSymlinkToHaikuImage home config settings deskbar Applications : /boot/apps/ArmyKnife/ArmyKnife ; } @@ -160,11 +154,11 @@ if [ IsOptionalHaikuImagePackageAdded Bazaar ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Bazaar available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage bzr-2.2.2-r1a3-x86-gcc4-2011-05-23.zip - : $(baseURL)/bzr-2.2.2-r1a3-x86-gcc4-2011-05-23.zip ; + InstallOptionalHaikuImagePackage + $(baseURL)/bzr-2.2.2-r1a3-x86-gcc4-2011-05-23.zip ; } else { - InstallOptionalHaikuImagePackage bzr-2.2.2-r1a3-x86-gcc2-2011-05-17.zip - : $(baseURL)/bzr-2.2.2-r1a3-x86-gcc2-2011-05-17.zip ; + InstallOptionalHaikuImagePackage + $(baseURL)/bzr-2.2.2-r1a3-x86-gcc2-2011-05-17.zip ; } } @@ -176,12 +170,10 @@ if [ IsOptionalHaikuImagePackageAdded BeAE ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - beae-22-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/beae-22-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/beae-22-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - beae-22-r1a3-x86-gcc2-2011-05-18.zip - : $(baseURL)/beae-22-r1a3-x86-gcc2-2011-05-18.zip ; + $(baseURL)/beae-22-r1a3-x86-gcc2-2011-05-18.zip ; } AddSymlinkToHaikuImage home config settings deskbar Applications : /boot/apps/BeAE/BeAE ; @@ -196,8 +188,8 @@ if [ IsOptionalHaikuImagePackageAdded Beam ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 { 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 ; + InstallOptionalHaikuImagePackage + $(baseURL)/Beam-1.2alpha-x86-gcc2-2010-04-29.zip ; AddSymlinkToHaikuImage home config settings deskbar Applications : /boot/apps/Beam/Beam ; } @@ -206,8 +198,8 @@ if [ IsOptionalHaikuImagePackageAdded Beam ] { # BeBook if [ IsOptionalHaikuImagePackageAdded BeBook ] { - InstallOptionalHaikuImagePackage bebook-2008-10-26-1.hpkg - : $(hpkgBaseURL)/bebook-2008-10-26-1.hpkg + InstallOptionalHaikuImagePackage + $(hpkgBaseURL)/bebook-2008-10-26-1.hpkg : system packages ; AddSymlinkToHaikuImage home Desktop : /boot/system/documentation/bebook/index.html @@ -257,8 +249,7 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] { Echo "No optional package BePDF available for gcc4" ; } else { InstallOptionalHaikuImagePackage - bepdf-1.1.1b4-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/bepdf-1.1.1b4-1-x86_gcc2.hpkg + $(hpkgBaseURL)/bepdf-1.1.1b4-1-x86_gcc2.hpkg : common packages ; AddSymlinkToHaikuImage home config settings deskbar Applications : /boot/apps/BePDF/BePDF ; @@ -273,12 +264,10 @@ if [ IsOptionalHaikuImagePackageAdded BeZillaBrowser ] { } else { 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_2010_05_02-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/bezillabrowser-2.0.0.22pre_2010_05_02-1-x86_gcc2.hpkg + $(hpkgBaseURL)/bezillabrowser-2.0.0.22pre_2010_05_02-1-x86_gcc2.hpkg : common packages ; } AddSymlinkToHaikuImage home config settings deskbar Applications @@ -321,12 +310,10 @@ if [ IsOptionalHaikuImagePackageAdded BurnItNow ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - burnitnow-39-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/burnitnow-39-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/burnitnow-39-r1a3-x86-gcc4-2011-05-24.zip ; } else { - InstallOptionalHaikuImagePackage - burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip - : $(baseURL)/burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip ; + InstallOptionalHaikuImagePackage + $(baseURL)/burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip ; } AddSymlinkToHaikuImage home config settings deskbar Applications : /boot/apps/BurnItNow/BurnItNow ; @@ -340,13 +327,11 @@ if [ IsOptionalHaikuImagePackageAdded Bzip ] { Echo "No optional package Bzip available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - bzip2-1.0.6-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/bzip2-1.0.6-r1a3-x86-gcc4-2011-05-24.zip + $(baseURL)/bzip2-1.0.6-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage - bzip2-1.0.6-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/bzip2-1.0.6-1-x86_gcc2.hpkg + $(hpkgBaseURL)/bzip2-1.0.6-1-x86_gcc2.hpkg : common packages ; } } @@ -358,12 +343,10 @@ if [ IsOptionalHaikuImagePackageAdded CCache ] { Echo "No optional package CCache available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - ccache-3.0.1-r1a3-x86-gcc4-2011-05-23.zip - : $(baseURL)/ccache-3.0.1-r1a3-x86-gcc4-2011-05-23.zip ; + $(baseURL)/ccache-3.0.1-r1a3-x86-gcc4-2011-05-23.zip ; } else { InstallOptionalHaikuImagePackage - ccache-3.0.1-r1a3-x86-gcc2-2011-05-17.zip - : $(baseURL)/ccache-3.0.1-r1a3-x86-gcc2-2011-05-17.zip ; + $(baseURL)/ccache-3.0.1-r1a3-x86-gcc2-2011-05-17.zip ; } } @@ -374,12 +357,10 @@ if [ IsOptionalHaikuImagePackageAdded CDRecord ] { Echo "No optional package CDRecord available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - cdrtools-3.01a01-r1a3-x86-gcc4-2011-05-23.zip - : $(baseURL)/cdrtools-3.01a01-r1a3-x86-gcc4-2011-05-23.zip ; + $(baseURL)/cdrtools-3.01a01-r1a3-x86-gcc4-2011-05-23.zip ; } else { InstallOptionalHaikuImagePackage - cdrtools-3.00-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/cdrtools-3.00-1-x86_gcc2.hpkg + $(hpkgBaseURL)/cdrtools-3.00-1-x86_gcc2.hpkg : common packages ; } } @@ -392,12 +373,10 @@ if [ IsOptionalHaikuImagePackageAdded Clockwerk ] { } 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 ; + $(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 ; + $(baseURL)/Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip ; } AddSymlinkToHaikuImage home config settings deskbar Applications : /boot/apps/Clockwerk/Clockwerk ; @@ -413,8 +392,7 @@ if [ IsOptionalHaikuImagePackageAdded CLucene ] { Echo "No optional package CLucene available for GCC2" ; } else { InstallOptionalHaikuImagePackage - clucene-0.9.21-x86-gcc4-haiku-2009-08-11.zip - : $(baseURL)/clucene-0.9.21-x86-gcc4-haiku-2009-08-11.zip + $(baseURL)/clucene-0.9.21-x86-gcc4-haiku-2009-08-11.zip : : true ; } } @@ -427,13 +405,11 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - cmake-2.8.4-r1a3-x86-gcc4-2011-05-23.zip - : $(baseURL)/cmake-2.8.4-r1a3-x86-gcc4-2011-05-23.zip + $(baseURL)/cmake-2.8.4-r1a3-x86-gcc4-2011-05-23.zip : : true ; } else { InstallOptionalHaikuImagePackage - cmake-2.8.5-2-gcc2_x86.hpkg - : $(hpkgBaseURL)/cmake-2.8.5-2-gcc2_x86.hpkg + $(hpkgBaseURL)/cmake-2.8.5-2-gcc2_x86.hpkg : common packages ; } } @@ -445,11 +421,11 @@ if [ IsOptionalHaikuImagePackageAdded Curl ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Curl available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage curl-7.21.7-x86-gcc4-2011-06-23.zip - : $(baseURL)/curl-7.21.7-x86-gcc4-2011-06-23.zip ; + InstallOptionalHaikuImagePackage + $(baseURL)/curl-7.21.7-x86-gcc4-2011-06-23.zip ; } else { - InstallOptionalHaikuImagePackage curl-7.21.6-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/curl-7.21.6-1-x86_gcc2.hpkg + InstallOptionalHaikuImagePackage + $(hpkgBaseURL)/curl-7.21.6-1-x86_gcc2.hpkg : common packages ; } } @@ -462,13 +438,11 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - cvs-1.12.13.1-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/cvs-1.12.13.1-r1a3-x86-gcc4-2011-05-24.zip + $(baseURL)/cvs-1.12.13.1-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage - cvs-1.12.13.1-2-x86_gcc2.hpkg - : $(hpkgBaseURL)/cvs-1.12.13.1-2-x86_gcc2.hpkg + $(hpkgBaseURL)/cvs-1.12.13.1-2-x86_gcc2.hpkg : common packages ; } } @@ -480,37 +454,29 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 { # autotools if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - autoconf-2.68-r1a3-x86-gcc4-2011-05-23.zip - : $(baseURL)/autoconf-2.68-r1a3-x86-gcc4-2011-05-23.zip + $(baseURL)/autoconf-2.68-r1a3-x86-gcc4-2011-05-23.zip : : true ; InstallOptionalHaikuImagePackage - automake-1.11.1-r1a3-x86-gcc4-2011-05-23.zip - : $(baseURL)/automake-1.11.1-r1a3-x86-gcc4-2011-05-23.zip + $(baseURL)/automake-1.11.1-r1a3-x86-gcc4-2011-05-23.zip : : true ; InstallOptionalHaikuImagePackage - libtool-2.4-r1a3-x86-gcc4-2011-05-23.zip - : $(baseURL)/libtool-2.4-r1a3-x86-gcc4-2011-05-23.zip + $(baseURL)/libtool-2.4-r1a3-x86-gcc4-2011-05-23.zip : : true ; InstallOptionalHaikuImagePackage - texinfo-4.13a-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/texinfo-4.13a-r1a3-x86-gcc4-2011-05-24.zip + $(baseURL)/texinfo-4.13a-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage - autoconf-2.68-3-x86_gcc2.hpkg - : $(hpkgBaseURL)/autoconf-2.68-3-x86_gcc2.hpkg + $(hpkgBaseURL)/autoconf-2.68-3-x86_gcc2.hpkg : common packages ; InstallOptionalHaikuImagePackage - automake-1.11.1-3-x86_gcc2.hpkg - : $(hpkgBaseURL)/automake-1.11.1-3-x86_gcc2.hpkg + $(hpkgBaseURL)/automake-1.11.1-3-x86_gcc2.hpkg : common packages ; InstallOptionalHaikuImagePackage - libtool-2.4-3-x86_gcc2.hpkg - : $(hpkgBaseURL)/libtool-2.4-3-x86_gcc2.hpkg + $(hpkgBaseURL)/libtool-2.4-3-x86_gcc2.hpkg : common packages ; InstallOptionalHaikuImagePackage - texinfo-4.13a-2-x86_gcc2.hpkg - : $(hpkgBaseURL)/texinfo-4.13a-2-x86_gcc2.hpkg + $(hpkgBaseURL)/texinfo-4.13a-2-x86_gcc2.hpkg : common packages ; } } @@ -521,8 +487,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] && $(TARGET_ARCH) = x86 { # gcc and binutils if $(HAIKU_GCC_VERSION[1]) = 2 { - InstallOptionalHaikuImagePackage gcc-2.95.3_110711-4-x86_gcc2.hpkg - : $(hpkgBaseURL)/gcc-2.95.3_110711-4-x86_gcc2.hpkg + InstallOptionalHaikuImagePackage + $(hpkgBaseURL)/gcc-2.95.3_110711-4-x86_gcc2.hpkg : common packages ; # TODO: remove this when we have a mechanism to switch gcc via PATH @@ -533,54 +499,41 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] if $(HAIKU_GCC_VERSION[1]) = 4 { InstallOptionalHaikuImagePackage - gcc-4.5.3-r1a3-x86-gcc4-2011-06-20.zip - : $(baseURL)/gcc-4.5.3-r1a3-x86-gcc4-2011-06-20.zip ; + $(baseURL)/gcc-4.5.3-r1a3-x86-gcc4-2011-06-20.zip ; } # other commonly used tools if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - bison-2.4.3-r1a3-x86-gcc4-2011-05-23.zip - : $(baseURL)/bison-2.4.3-r1a3-x86-gcc4-2011-05-23.zip ; + $(baseURL)/bison-2.4.3-r1a3-x86-gcc4-2011-05-23.zip ; InstallOptionalHaikuImagePackage - m4-1.4.16-r1a3-x86-gcc4-2011-05-23.zip - : $(baseURL)/m4-1.4.16-r1a3-x86-gcc4-2011-05-23.zip ; + $(baseURL)/m4-1.4.16-r1a3-x86-gcc4-2011-05-23.zip ; InstallOptionalHaikuImagePackage - flex-2.5.35-r1a3-x86-gcc4-2011-05-23.zip - : $(baseURL)/flex-2.5.35-r1a3-x86-gcc4-2011-05-23.zip ; + $(baseURL)/flex-2.5.35-r1a3-x86-gcc4-2011-05-23.zip ; InstallOptionalHaikuImagePackage - jam-2.5-r1a3-x86-gcc4-2011-05-23.zip - : $(baseURL)/jam-2.5-r1a3-x86-gcc4-2011-05-23.zip ; + $(baseURL)/jam-2.5-r1a3-x86-gcc4-2011-05-23.zip ; InstallOptionalHaikuImagePackage - mkdepend-1.7-r1a3-x86-gcc4-2011-05-23.zip - : $(baseURL)/mkdepend-1.7-r1a3-x86-gcc4-2011-05-23.zip ; + $(baseURL)/mkdepend-1.7-r1a3-x86-gcc4-2011-05-23.zip ; InstallOptionalHaikuImagePackage - make-3.82-r1a3-x86-gcc4-2011-05-23.zip - : $(baseURL)/make-3.82-r1a3-x86-gcc4-2011-05-23.zip ; + $(baseURL)/make-3.82-r1a3-x86-gcc4-2011-05-23.zip ; } else { InstallOptionalHaikuImagePackage - bison-2.4.3-2-x86_gcc2.hpkg - : $(hpkgBaseURL)/bison-2.4.3-2-x86_gcc2.hpkg + $(hpkgBaseURL)/bison-2.4.3-2-x86_gcc2.hpkg : common packages ; InstallOptionalHaikuImagePackage - m4-1.4.16-3-x86_gcc2.hpkg - : $(hpkgBaseURL)/m4-1.4.16-3-x86_gcc2.hpkg + $(hpkgBaseURL)/m4-1.4.16-3-x86_gcc2.hpkg : common packages ; InstallOptionalHaikuImagePackage - flex-2.5.35-2-x86_gcc2.hpkg - : $(hpkgBaseURL)/flex-2.5.35-2-x86_gcc2.hpkg + $(hpkgBaseURL)/flex-2.5.35-2-x86_gcc2.hpkg : common packages ; InstallOptionalHaikuImagePackage - jam-2.5-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/jam-2.5-1-x86_gcc2.hpkg + $(hpkgBaseURL)/jam-2.5-1-x86_gcc2.hpkg : common packages ; InstallOptionalHaikuImagePackage - mkdepend-1.7-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/mkdepend-1.7-1-x86_gcc2.hpkg + $(hpkgBaseURL)/mkdepend-1.7-1-x86_gcc2.hpkg : common packages ; InstallOptionalHaikuImagePackage - make-3.82-3-x86_gcc2.hpkg - : $(hpkgBaseURL)/make-3.82-3-x86_gcc2.hpkg + $(hpkgBaseURL)/make-3.82-3-x86_gcc2.hpkg : common packages ; } } @@ -594,16 +547,13 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentJava ] { Echo "No optional package DevelopmentJava available for gcc2" ; } else { InstallOptionalHaikuImagePackage - gnu-classpath-0.98-r1a3-x86-gcc4-2011-06-08.zip - : $(baseURL)/gnu-classpath-0.98-r1a3-x86-gcc4-2011-06-08.zip ; + $(baseURL)/gnu-classpath-0.98-r1a3-x86-gcc4-2011-06-08.zip ; InstallOptionalHaikuImagePackage - jamvm-1.5.4-r1a3-x86-gcc4-2011-06-08.zip - : $(baseURL)/jamvm-1.5.4-r1a3-x86-gcc4-2011-06-08.zip ; + $(baseURL)/jamvm-1.5.4-r1a3-x86-gcc4-2011-06-08.zip ; AddSymlinkToHaikuImage common bin : /boot/common/bin/jamvm : java ; InstallOptionalHaikuImagePackage - ecj-3.6.2-haiku-2011-06-08.zip - : $(baseURL)/ecj-3.6.2-haiku-2011-06-08.zip ; + $(baseURL)/ecj-3.6.2-haiku-2011-06-08.zip ; } } @@ -626,12 +576,10 @@ if [ IsOptionalHaikuImagePackageAdded DMIDecode ] { Echo "No optional package DMIDecode available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - dmidecode-2.11-x86-gcc4-2011-11-02.zip - : http://revolf.free.fr/beos/dmidecode-2.11-x86-gcc4-2011-11-02.zip ; + http://revolf.free.fr/beos/dmidecode-2.11-x86-gcc4-2011-11-02.zip ; } else { InstallOptionalHaikuImagePackage - dmidecode-2.11-x86-gcc2-2011-11-02.zip - : http://revolf.free.fr/beos/dmidecode-2.11-x86-gcc2-2011-11-02.zip ; + http://revolf.free.fr/beos/dmidecode-2.11-x86-gcc2-2011-11-02.zip ; } } @@ -643,13 +591,11 @@ if [ IsOptionalHaikuImagePackageAdded Doxygen ] { } 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 + $(baseURL)/doxygen-1.6.3-x86-gcc4-2010-05-17.zip : : true ; } else { InstallOptionalHaikuImagePackage - doxygen-1.6.3-1-gcc2_x86.hpkg - : $(hpkgBaseURL)/doxygen-1.6.3-1-gcc2_x86.hpkg + $(hpkgBaseURL)/doxygen-1.6.3-1-gcc2_x86.hpkg : common packages ; } } @@ -663,13 +609,11 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - expat-2.0.1-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/expat-2.0.1-r1a3-x86-gcc4-2011-05-24.zip + $(baseURL)/expat-2.0.1-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage - expat-2.0.1-3-x86_gcc2.hpkg - : $(hpkgBaseURL)/expat-2.0.1-3-x86_gcc2.hpkg + $(hpkgBaseURL)/expat-2.0.1-3-x86_gcc2.hpkg : common packages ; } } @@ -682,12 +626,10 @@ if [ IsOptionalHaikuImagePackageAdded Fastdep ] { Echo "No optional package Fastdep available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - fastdep-0.16-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/fastdep-0.16-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/fastdep-0.16-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - fastdep-0.16-r1a3-x86-gcc2-2011-05-18.zip - : $(baseURL)/fastdep-0.16-r1a3-x86-gcc2-2011-05-18.zip ; + $(baseURL)/fastdep-0.16-r1a3-x86-gcc2-2011-05-18.zip ; } } @@ -699,12 +641,10 @@ if [ IsOptionalHaikuImagePackageAdded friss ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - friss-24-r1a3-x86-gcc4-2011-05-31.zip - : $(baseURL)/friss-24-r1a3-x86-gcc4-2011-05-31.zip ; + $(baseURL)/friss-24-r1a3-x86-gcc4-2011-05-31.zip ; } else { InstallOptionalHaikuImagePackage - friss-24-r1a3-x86-gcc2-2011-05-31.zip - : $(baseURL)/friss-24-r1a3-x86-gcc2-2011-05-31.zip ; + $(baseURL)/friss-24-r1a3-x86-gcc2-2011-05-31.zip ; } # AddSymlinkToHaikuImage home config settings deskbar Desktop\ applets # : /boot/apps/FRiSS/FRiSS ; @@ -719,13 +659,11 @@ if [ IsOptionalHaikuImagePackageAdded GetText ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - gettext-0.18.1.1-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/gettext-0.18.1.1-r1a3-x86-gcc4-2011-05-24.zip + $(baseURL)/gettext-0.18.1.1-r1a3-x86-gcc4-2011-05-24.zip : : 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 + $(baseURL)/gettext-0.18.1.1-x86-gcc2-2011-02-07.zip : : true ; } } @@ -739,13 +677,11 @@ if [ IsOptionalHaikuImagePackageAdded Git ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - git-1.7.5-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/git-1.7.5-r1a3-x86-gcc4-2011-05-24.zip + $(baseURL)/git-1.7.5-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage - git-1.7.5-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/git-1.7.5-1-x86_gcc2.hpkg + $(hpkgBaseURL)/git-1.7.5-1-x86_gcc2.hpkg : common packages ; } } @@ -759,13 +695,11 @@ if [ IsOptionalHaikuImagePackageAdded GPerf ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - gperf-3.0.4-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/gperf-3.0.4-r1a3-x86-gcc4-2011-05-24.zip + $(baseURL)/gperf-3.0.4-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage - gperf-3.0.4-r1a3-x86-gcc2-2011-05-18.zip - : $(baseURL)/gperf-3.0.4-r1a3-x86-gcc2-2011-05-18.zip + $(baseURL)/gperf-3.0.4-r1a3-x86-gcc2-2011-05-18.zip : : true ; } } @@ -779,13 +713,11 @@ if [ IsOptionalHaikuImagePackageAdded Groff ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - groff-1.20.1-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/groff-1.20.1-r1a3-x86-gcc4-2011-05-24.zip + $(baseURL)/groff-1.20.1-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage - groff-1.20.1-r1a3-x86-gcc2-2011-05-18.zip - : $(baseURL)/groff-1.20.1-r1a3-x86-gcc2-2011-05-18.zip + $(baseURL)/groff-1.20.1-r1a3-x86-gcc2-2011-05-18.zip : : true ; } } @@ -799,13 +731,13 @@ if [ IsOptionalHaikuImagePackageAdded ICU ] { } else { if $(HAIKU_GCC_VERSION[1]) = 2 { # unzip gcc2 - InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_2_PACKAGE) - : $(hpkgBaseURL)/$(HAIKU_ICU_GCC_2_PACKAGE) + InstallOptionalHaikuImagePackage + $(hpkgBaseURL)/$(HAIKU_ICU_GCC_2_PACKAGE) : system packages ; } else { # unzip gcc4 - InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_4_PACKAGE) - : $(baseURL)/$(HAIKU_ICU_GCC_4_PACKAGE) + InstallOptionalHaikuImagePackage + $(baseURL)/$(HAIKU_ICU_GCC_4_PACKAGE) : system lib ; } } @@ -814,8 +746,8 @@ if [ IsOptionalHaikuImagePackageAdded ICU ] { # ICU-devel if [ IsOptionalHaikuImagePackageAdded ICU-devel ] { - InstallOptionalHaikuImagePackage $(HAIKU_ICU_DEVEL_PACKAGE) - : $(hpkgBaseURL)/$(HAIKU_ICU_DEVEL_PACKAGE) + InstallOptionalHaikuImagePackage + $(hpkgBaseURL)/$(HAIKU_ICU_DEVEL_PACKAGE) : common packages ; local arch = $(TARGET_ARCH) ; @@ -838,12 +770,10 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - KeymapSwitcher-1.2.6-r1a3-x86-gcc4-2011-06-12.zip - : $(baseURL)/KeymapSwitcher-1.2.6-r1a3-x86-gcc4-2011-06-12.zip ; + $(baseURL)/KeymapSwitcher-1.2.6-r1a3-x86-gcc4-2011-06-12.zip ; } else { InstallOptionalHaikuImagePackage - KeymapSwitcher-1.2.6-r1a3-x86-gcc2-2011-06-12.zip - : $(baseURL)/KeymapSwitcher-1.2.6-r1a3-x86-gcc2-2011-06-12.zip ; + $(baseURL)/KeymapSwitcher-1.2.6-r1a3-x86-gcc2-2011-06-12.zip ; } AddSymlinkToHaikuImage home config settings deskbar Preferences : /boot/common/bin/KeymapSwitcher ; @@ -858,13 +788,11 @@ if [ IsOptionalHaikuImagePackageAdded LibEvent ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libevent-2.0.10-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/lib/libevent-2.0.10-r1a3-x86-gcc4-2011-05-24.zip + $(baseURL)/lib/libevent-2.0.10-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage - libevent-2.0.10-r1a3-x86-gcc2-2011-05-18.zip - : $(baseURL)/lib/libevent-2.0.10-r1a3-x86-gcc2-2011-05-18.zip + $(baseURL)/lib/libevent-2.0.10-r1a3-x86-gcc2-2011-05-18.zip : : true ; } } @@ -878,12 +806,10 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libiconv-1.13.1-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/libiconv-1.13.1-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/libiconv-1.13.1-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - libiconv-1.13.1-3-x86_gcc2.hpkg - : $(hpkgBaseURL)/libiconv-1.13.1-3-x86_gcc2.hpkg + $(hpkgBaseURL)/libiconv-1.13.1-3-x86_gcc2.hpkg : common packages ; } } @@ -897,8 +823,8 @@ if [ IsOptionalHaikuImagePackageAdded LibLayout ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 { 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 ; + InstallOptionalHaikuImagePackage + $(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip ; } } @@ -909,12 +835,10 @@ if [ IsOptionalHaikuImagePackageAdded Libmng ] { Echo "No optional package Libmng available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/lib/libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/lib/libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - libmng-1.0.10-r1a3-x86-gcc2-2011-05-18.zip - : $(baseURL)/lib/libmng-1.0.10-r1a3-x86-gcc2-2011-05-18.zip ; + $(baseURL)/lib/libmng-1.0.10-r1a3-x86-gcc2-2011-05-18.zip ; } } @@ -924,8 +848,8 @@ if [ IsOptionalHaikuImagePackageAdded LibSolv ] { if ! $(HAIKU_LIBSOLV_PACKAGE) { Echo "No optional package LibSolv available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage $(HAIKU_LIBSOLV_PACKAGE) - : $(hpkgBaseURL)/$(HAIKU_LIBSOLV_PACKAGE) + InstallOptionalHaikuImagePackage + $(hpkgBaseURL)/$(HAIKU_LIBSOLV_PACKAGE) : system packages ; } } @@ -938,12 +862,10 @@ if [ IsOptionalHaikuImagePackageAdded LibXML2 ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libxml2-2.7.8-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/libxml2-2.7.8-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/libxml2-2.7.8-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - libxml2-2.7.8-3-x86_gcc2.hpkg - : $(hpkgBaseURL)/libxml2-2.7.8-3-x86_gcc2.hpkg + $(hpkgBaseURL)/libxml2-2.7.8-3-x86_gcc2.hpkg : common packages ; } } @@ -956,12 +878,10 @@ if [ IsOptionalHaikuImagePackageAdded LibXSLT ] { Echo "No optional package LibXSLT available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libxslt-1.1.26-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/libxslt-1.1.26-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/libxslt-1.1.26-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - libxslt-1.1.26-r1a3-x86-gcc2-2011-05-18.zip - : $(baseURL)/libxslt-1.1.26-r1a3-x86-gcc2-2011-05-18.zip + $(baseURL)/libxslt-1.1.26-r1a3-x86-gcc2-2011-05-18.zip : : true ; } } @@ -974,8 +894,8 @@ if [ IsOptionalHaikuImagePackageAdded Links ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 { Echo "No optional package Links available for gcc4" ; } else { - InstallOptionalHaikuImagePackage Links.zip - : $(baseURL)/links-x86-gcc2-2008-05-03.zip ; + InstallOptionalHaikuImagePackage + $(baseURL)/links-x86-gcc2-2008-05-03.zip ; AddSymlinkToHaikuImage home config settings deskbar Applications : /boot/home/config/bin/links ; } @@ -989,13 +909,11 @@ if [ IsOptionalHaikuImagePackageAdded Lua ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - lua-5.1.4-x86-gcc4-2010-10-30.zip - : $(baseURL)/lua-5.1.4-x86-gcc4-2010-10-30.zip + $(baseURL)/lua-5.1.4-x86-gcc4-2010-10-30.zip : : true ; } else { InstallOptionalHaikuImagePackage - lua-5.1.4-3-r1a3-x86-gcc2-2011-05-18.zip - : $(baseURL)/lua-5.1.4-3-r1a3-x86-gcc2-2011-05-18.zip + $(baseURL)/lua-5.1.4-3-r1a3-x86-gcc2-2011-05-18.zip : : true ; } } @@ -1008,12 +926,10 @@ if [ IsOptionalHaikuImagePackageAdded Man ] { Echo "No optional package Man available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - man-1.6f-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/man-1.6f-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/man-1.6f-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - man-1.6f-r1a3-x86-gcc2-2011-05-18.zip - : $(baseURL)/man-1.6f-r1a3-x86-gcc2-2011-05-18.zip ; + $(baseURL)/man-1.6f-r1a3-x86-gcc2-2011-05-18.zip ; } } @@ -1031,13 +947,11 @@ if [ IsOptionalHaikuImagePackageAdded Mercurial ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - mercurial-1.8.3-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/mercurial-1.8.3-r1a3-x86-gcc4-2011-05-24.zip + $(baseURL)/mercurial-1.8.3-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage - mercurial-1.8.3-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/mercurial-1.8.3-1-x86_gcc2.hpkg + $(hpkgBaseURL)/mercurial-1.8.3-1-x86_gcc2.hpkg : common packages ; } } @@ -1051,12 +965,10 @@ if [ IsOptionalHaikuImagePackageAdded Nano ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - nano-2.2.6-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/nano-2.2.6-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/nano-2.2.6-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - nano-2.2.6-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/nano-2.2.6-1-x86_gcc2.hpkg + $(hpkgBaseURL)/nano-2.2.6-1-x86_gcc2.hpkg : common packages ; } } @@ -1070,12 +982,10 @@ if [ IsOptionalHaikuImagePackageAdded Neon ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - neon-0.29.6-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/neon-0.29.6-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/neon-0.29.6-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - neon-0.29.6-3-x86_gcc2.hpkg - : $(hpkgBaseURL)/neon-0.29.6-3-x86_gcc2.hpkg + $(hpkgBaseURL)/neon-0.29.6-3-x86_gcc2.hpkg : common packages ; } } @@ -1121,8 +1031,7 @@ if [ IsOptionalHaikuImagePackageAdded NetSurf ] { Echo "No optional package NetSurf available for gcc4" ; } else { InstallOptionalHaikuImagePackage - netsurf-2.7-r1a3-x86-gcc2-2011-06-04.zip - : $(baseURL)/netsurf-2.7-r1a3-x86-gcc2-2011-06-04.zip ; + $(baseURL)/netsurf-2.7-r1a3-x86-gcc2-2011-06-04.zip ; AddSymlinkToHaikuImage home config settings deskbar Applications : /boot/apps/NetSurf/NetSurf ; } @@ -1137,11 +1046,9 @@ if [ IsOptionalHaikuImagePackageAdded OCaml ] { Echo "No optional package OCaml available for gcc4" ; } 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 ; } } @@ -1152,8 +1059,7 @@ if [ IsOptionalHaikuImagePackageAdded OpenSound ] { Echo "No optional package OpenSound available for $(TARGET_ARCH)" ; } else { InstallOptionalHaikuImagePackage - opensound-4.2-r1a2-x86-gcc2-2010-05-01.zip - : $(baseURL)/opensound-4.2-r1a2-x86-gcc2-2010-05-01.zip ; + $(baseURL)/opensound-4.2-r1a2-x86-gcc2-2010-05-01.zip ; } } @@ -1170,12 +1076,10 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - openssh-5.9p1-x86-gcc4-2011-09-08.zip - : $(baseURL)/openssh-5.9p1-x86-gcc4-2011-09-08.zip ; + $(baseURL)/openssh-5.9p1-x86-gcc4-2011-09-08.zip ; } else { InstallOptionalHaikuImagePackage - openssh-5.8p2-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/openssh-5.8p2-1-x86_gcc2.hpkg + $(hpkgBaseURL)/openssh-5.8p2-1-x86_gcc2.hpkg : common packages ; } @@ -1191,11 +1095,9 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] { Echo "No optional package OpenSSL available for $(TARGET_ARCH)" ; } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage $(HAIKU_OPENSSL_PACKAGE) - : $(HAIKU_OPENSSL_URL) ; + InstallOptionalHaikuImagePackage $(HAIKU_OPENSSL_URL) ; } else { - InstallOptionalHaikuImagePackage $(HAIKU_OPENSSL_PACKAGE) - : $(HAIKU_OPENSSL_URL) + InstallOptionalHaikuImagePackage $(HAIKU_OPENSSL_URL) : common packages ; } } @@ -1209,12 +1111,10 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - p7zip-9.13-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/p7zip-9.13-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/p7zip-9.13-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - p7zip-9.13-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/p7zip-9.13-1-x86_gcc2.hpkg + $(hpkgBaseURL)/p7zip-9.13-1-x86_gcc2.hpkg : common packages ; } AddExpanderRuleToHaikuImage "application/x-7z-compressed" : .7z @@ -1233,12 +1133,10 @@ if [ IsOptionalHaikuImagePackageAdded Paladin ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - paladin-1.3-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/paladin-1.3-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/paladin-1.3-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - paladin-1.3-r1a3-x86-gcc2-2011-05-18.zip - : $(baseURL)/paladin-1.3-r1a3-x86-gcc2-2011-05-18.zip ; + $(baseURL)/paladin-1.3-r1a3-x86-gcc2-2011-05-18.zip ; } AddSymlinkToHaikuImage home config settings deskbar Applications @@ -1256,12 +1154,10 @@ if [ IsOptionalHaikuImagePackageAdded PCRE ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libpcre-8.12-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/libpcre-8.12-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/libpcre-8.12-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - libpcre-8.12-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/libpcre-8.12-1-x86_gcc2.hpkg + $(hpkgBaseURL)/libpcre-8.12-1-x86_gcc2.hpkg : common packages ; } } @@ -1275,12 +1171,10 @@ if [ IsOptionalHaikuImagePackageAdded Pe ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - pe-2.4.3-600-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/pe-2.4.3-600-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/pe-2.4.3-600-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - pe-2.4.3_600-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/pe-2.4.3_600-1-x86_gcc2.hpkg + $(hpkgBaseURL)/pe-2.4.3_600-1-x86_gcc2.hpkg : common packages ; } AddSymlinkToHaikuImage home config settings deskbar Applications @@ -1296,13 +1190,11 @@ if [ IsOptionalHaikuImagePackageAdded Perl ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - perl-5.10.1-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/perl-5.10.1-r1a3-x86-gcc4-2011-05-24.zip + $(baseURL)/perl-5.10.1-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage - perl-5.10.1-3-x86_gcc2.hpkg - : $(hpkgBaseURL)/perl-5.10.1-3-x86_gcc2.hpkg + $(hpkgBaseURL)/perl-5.10.1-3-x86_gcc2.hpkg : common packages ; } } @@ -1316,13 +1208,11 @@ if [ IsOptionalHaikuImagePackageAdded Python ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - python-2.6.7-x86-gcc4-2011-06-24.zip - : $(baseURL)/python-2.6.7-x86-gcc4-2011-06-24.zip + $(baseURL)/python-2.6.7-x86-gcc4-2011-06-24.zip : : true ; } else { InstallOptionalHaikuImagePackage - python-2.6.6-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/python-2.6.6-1-x86_gcc2.hpkg + $(hpkgBaseURL)/python-2.6.6-1-x86_gcc2.hpkg : common packages ; } } @@ -1336,13 +1226,11 @@ if [ IsOptionalHaikuImagePackageAdded Rsync ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - rsync-3.0.7-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/rsync-3.0.7-r1a3-x86-gcc4-2011-05-24.zip + $(baseURL)/rsync-3.0.7-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage - rsync-3.0.7-r1a3-x86-gcc2-2011-05-18.zip - : $(baseURL)/rsync-3.0.7-r1a3-x86-gcc2-2011-05-18.zip + $(baseURL)/rsync-3.0.7-r1a3-x86-gcc2-2011-05-18.zip : : true ; } } @@ -1355,12 +1243,10 @@ if [ IsOptionalHaikuImagePackageAdded Ruby ] { Echo "No optional package Ruby available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - ruby-1.9.1-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/ruby-1.9.1-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/ruby-1.9.1-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - ruby-1.9.1-r1a3-x86-gcc2-2011-05-31.zip - : $(baseURL)/ruby-1.9.1-r1a3-x86-gcc2-2011-06-01.zip ; + $(baseURL)/ruby-1.9.1-r1a3-x86-gcc2-2011-06-01.zip ; } } @@ -1371,12 +1257,10 @@ if [ IsOptionalHaikuImagePackageAdded Sed ] { Echo "No optional package Sed available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - sed-4.2.1-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/sed-4.2.1-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/sed-4.2.1-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - sed-4.2.1-2-x86_gcc2.hpkg - : $(hpkgBaseURL)/sed-4.2.1-2-x86_gcc2.hpkg + $(hpkgBaseURL)/sed-4.2.1-2-x86_gcc2.hpkg : common packages ; } } @@ -1389,12 +1273,10 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - sqlite-3.7.5-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/sqlite-3.7.5-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/sqlite-3.7.5-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - sqlite-3.7.5-4-x86_gcc2.hpkg - : $(hpkgBaseURL)/sqlite-3.7.5-4-x86_gcc2.hpkg + $(hpkgBaseURL)/sqlite-3.7.5-4-x86_gcc2.hpkg : common packages ; } } @@ -1408,13 +1290,11 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - subversion-1.6.17-x86-gcc4-2011-08-03.zip - : $(baseURL)/subversion-1.6.17-x86-gcc4-2011-08-03.zip + $(baseURL)/subversion-1.6.17-x86-gcc4-2011-08-03.zip : : true ; } else { InstallOptionalHaikuImagePackage - subversion-1.6.15-3-x86_gcc2.hpkg - : $(hpkgBaseURL)/subversion-1.6.15-3-x86_gcc2.hpkg + $(hpkgBaseURL)/subversion-1.6.15-3-x86_gcc2.hpkg : common packages ; } } @@ -1427,12 +1307,10 @@ if [ IsOptionalHaikuImagePackageAdded TagLib ] { Echo "No optional package TagLib available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - taglib-1.6.3-r1r3-x86-gcc4-2011-05-24.zip - : $(baseURL)/taglib-1.6.3-r1r3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/taglib-1.6.3-r1r3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - taglib-1.6.3-r1a3-x86-gcc2-2011-05-20.zip - : $(baseURL)/taglib-1.6.3-r1a3-x86-gcc2-2011-05-20.zip ; + $(baseURL)/taglib-1.6.3-r1a3-x86-gcc2-2011-05-20.zip ; } } @@ -1444,12 +1322,10 @@ if [ IsOptionalHaikuImagePackageAdded Tar ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - tar-1.25-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/tar-1.25-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/tar-1.25-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - tar-1.26-2-x86_gcc2.hpkg - : $(hpkgBaseURL)/tar-1.26-2-x86_gcc2.hpkg + $(hpkgBaseURL)/tar-1.26-2-x86_gcc2.hpkg : common packages ; } } @@ -1458,16 +1334,16 @@ if [ IsOptionalHaikuImagePackageAdded Tar ] { # TimGMSoundFont if [ IsOptionalHaikuImagePackageAdded TimGMSoundFont ] { - InstallOptionalHaikuImagePackage TimGMSoundFont-2010-06-16.hpkg - : $(hpkgBaseURL)/TimGMSoundFont-2010-06-16.hpkg + InstallOptionalHaikuImagePackage + $(hpkgBaseURL)/TimGMSoundFont-2010-06-16.hpkg : system packages ; } # TrackerNewTemplates if [ IsOptionalHaikuImagePackageAdded TrackerNewTemplates ] { - InstallOptionalHaikuImagePackage TrackerNewTemplates-2010-04-26.zip - : $(baseURL)/TrackerNewTemplates-2010-04-26.zip + InstallOptionalHaikuImagePackage + $(baseURL)/TrackerNewTemplates-2010-04-26.zip : home config settings Tracker "Tracker New Templates" ; } @@ -1480,13 +1356,11 @@ if [ IsOptionalHaikuImagePackageAdded Transmission ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - transmission-2.21-r1a3-x86-gcc4-2011-05-27.zip - : $(baseURL)/transmission-2.21-r1a3-x86-gcc4-2011-05-27.zip + $(baseURL)/transmission-2.21-r1a3-x86-gcc4-2011-05-27.zip : : true ; } else { InstallOptionalHaikuImagePackage - transmission-2.21-r1a3-x86-gcc2-2011-05-27.zip - : $(baseURL)/transmission-2.21-r1a3-x86-gcc2-2011-05-27.zip + $(baseURL)/transmission-2.21-r1a3-x86-gcc2-2011-05-27.zip : : true ; } } @@ -1551,12 +1425,12 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] { Echo "No optional package Vim available for $(TARGET_ARCH)" ; } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage vim-7.3-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/vim-7.3-r1a3-x86-gcc4-2011-05-26.zip + InstallOptionalHaikuImagePackage + $(baseURL)/vim-7.3-r1a3-x86-gcc4-2011-05-26.zip : : true ; } else { - InstallOptionalHaikuImagePackage vim-7.3-r1a3-x86-gcc2-2011-05-26.zip - : $(baseURL)/vim-7.3-r1a3-x86-gcc2-2011-05-26.zip + InstallOptionalHaikuImagePackage + $(baseURL)/vim-7.3-r1a3-x86-gcc2-2011-05-26.zip : : true ; } AddSymlinkToHaikuImage home config settings deskbar Applications @@ -1573,12 +1447,11 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] { Echo "No optional package Vision available for $(TARGET_ARCH)" ; } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage vision-908-r1a3-x86-gcc4-2011-06-07.zip - : $(baseURL)/vision-908-r1a3-x86-gcc4-2011-06-07.zip ; + InstallOptionalHaikuImagePackage + $(baseURL)/vision-908-r1a3-x86-gcc4-2011-06-07.zip ; } else { InstallOptionalHaikuImagePackage - vision-908-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/vision-908-1-x86_gcc2.hpkg + $(hpkgBaseURL)/vision-908-1-x86_gcc2.hpkg : common packages ; } AddSymlinkToHaikuImage home config settings deskbar Applications @@ -1595,8 +1468,7 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] { Echo "No optional package WebPositive available for gcc2" ; } else { InstallOptionalHaikuImagePackage - WebPositive-r1a3-gcc4-x86-r580-2011-06-02.zip - : $(baseURL)/WebPositive-r1a3-gcc4-x86-r580-2011-06-02.zip ; + $(baseURL)/WebPositive-r1a3-gcc4-x86-r580-2011-06-02.zip ; AddSymlinkToHaikuImage home config settings deskbar Applications : /boot/apps/WebPositive/WebPositive ; } @@ -1674,8 +1546,8 @@ if [ IsOptionalHaikuImagePackageAdded WonderBrush ] { Echo "No optional package WonderBrush available for gcc4" ; } else { # TODO: Package as HPKG! -# InstallOptionalHaikuImagePackage WonderBrush-2.1.2.zip -# : $(baseURL)/WonderBrush-2.1.2-x86-gcc2-2008-11-08.zip +# InstallOptionalHaikuImagePackage +# $(baseURL)/WonderBrush-2.1.2-x86-gcc2-2008-11-08.zip # : common apps ; # AddSymlinkToHaikuImage home config settings deskbar Applications # : /boot/apps/WonderBrush/WonderBrush ; @@ -1689,12 +1561,10 @@ if [ IsOptionalHaikuImagePackageAdded wpa_supplicant ] { Echo "No optional package wpa_supplicant available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - wpa_supplicant-0.7.3-x86-gcc4-2011-10-05.zip - : $(baseURL)/wpa_supplicant-0.7.3-x86-gcc4-2011-10-05.zip ; + $(baseURL)/wpa_supplicant-0.7.3-x86-gcc4-2011-10-05.zip ; } else { InstallOptionalHaikuImagePackage - wpa_supplicant-0.7.3-x86-gcc2-2011-10-05.zip - : $(baseURL)/wpa_supplicant-0.7.3-x86-gcc2-2011-10-05.zip ; + $(baseURL)/wpa_supplicant-0.7.3-x86-gcc2-2011-10-05.zip ; } } @@ -1702,8 +1572,7 @@ if [ IsOptionalHaikuImagePackageAdded wpa_supplicant ] { # WQY-MicroHei if [ IsOptionalHaikuImagePackageAdded WQY-MicroHei ] { InstallOptionalHaikuImagePackage - wqy-microhei-0.2.0-beta-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/wqy-microhei-0.2.0-beta-1-x86_gcc2.hpkg + $(hpkgBaseURL)/wqy-microhei-0.2.0-beta-1-x86_gcc2.hpkg : common packages ; } @@ -1714,8 +1583,7 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] { Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ; } else { InstallOptionalHaikuImagePackage - xz-utils-5.0.1-2-x86_gcc2.hpkg - : $(hpkgBaseURL)/xz-utils-5.0.1-2-x86_gcc2.hpkg + $(hpkgBaseURL)/xz-utils-5.0.1-2-x86_gcc2.hpkg : common packages ; AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz : "tar -Jtvf \\0045s" @@ -1739,12 +1607,10 @@ if [ IsOptionalHaikuImagePackageAdded Yasm ] { Echo "No optional package Yasm available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - yasm-1.1.0-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/yasm-1.1.0-r1a3-x86-gcc4-2011-05-24.zip ; + $(baseURL)/yasm-1.1.0-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - yasm-1.1.0-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/yasm-1.1.0-1-x86_gcc2.hpkg + $(hpkgBaseURL)/yasm-1.1.0-1-x86_gcc2.hpkg : common packages ; } }