[haiku-commits] BRANCH HaikuPM-github.package-management [2bab285] in build/jam: . images
- From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 7 Jul 2013 11:00:31 +0200 (CEST)
added 2 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: 056e9bb6206161f4974a4e35bd8eb3b64913505d
new head: 2bab2851aa2b67798f34ea35b8b6c04e6a0afba4
overview: https://github.com/haiku/HaikuPM/compare/056e9bb...2bab285
----------------------------------------------------------------------------
e8c5236: Move image definition jamfiles to build/jam/images
2bab285: Remove OptionLibPackages
[ Ingo Weinhold <ingo_weinhold@xxxxxx> ]
----------------------------------------------------------------------------
10 files changed, 8 insertions(+), 297 deletions(-)
Jamfile | 14 +-
build/jam/OptionalLibPackages | 286 -----------------------------
build/jam/{ => images}/AnybootImage | 0
build/jam/{ => images}/CDBootImage | 0
build/jam/{ => images}/CDBootPPCImage | 0
build/jam/{ => images}/FloppyBootImage | 0
build/jam/{ => images}/Haiku64Image | 4 +-
build/jam/{ => images}/HaikuCD | 0
build/jam/{ => images}/HaikuImage | 1 -
build/jam/{ => images}/NetBootArchive | 0
############################################################################
Commit: e8c5236a9ce57f3f8f0c879b734e2d2a64617743
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Sun Jul 7 08:44:43 2013 UTC
Move image definition jamfiles to build/jam/images
----------------------------------------------------------------------------
diff --git a/Jamfile b/Jamfile
index dcfbf5f..3ce3a69 100644
--- a/Jamfile
+++ b/Jamfile
@@ -42,13 +42,13 @@ SubDir HAIKU_TOP ;
UserBuildConfigRulePostBuildTargets ;
# specify the Haiku image and network boot archive contents
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuImage ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) NetBootArchive ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) FloppyBootImage ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) CDBootImage ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) CDBootPPCImage ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuCD ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) AnybootImage ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) images HaikuImage ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) images NetBootArchive ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) images FloppyBootImage ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) images CDBootImage ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) images CDBootPPCImage ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) images HaikuCD ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) images AnybootImage ] ;
# Check whether all requested optional packages do actually exist.
local package ;
diff --git a/build/jam/AnybootImage b/build/jam/images/AnybootImage
similarity index 100%
rename from build/jam/AnybootImage
rename to build/jam/images/AnybootImage
diff --git a/build/jam/CDBootImage b/build/jam/images/CDBootImage
similarity index 100%
rename from build/jam/CDBootImage
rename to build/jam/images/CDBootImage
diff --git a/build/jam/CDBootPPCImage b/build/jam/images/CDBootPPCImage
similarity index 100%
rename from build/jam/CDBootPPCImage
rename to build/jam/images/CDBootPPCImage
diff --git a/build/jam/FloppyBootImage b/build/jam/images/FloppyBootImage
similarity index 100%
rename from build/jam/FloppyBootImage
rename to build/jam/images/FloppyBootImage
diff --git a/build/jam/Haiku64Image b/build/jam/images/Haiku64Image
similarity index 100%
rename from build/jam/Haiku64Image
rename to build/jam/images/Haiku64Image
diff --git a/build/jam/HaikuCD b/build/jam/images/HaikuCD
similarity index 100%
rename from build/jam/HaikuCD
rename to build/jam/images/HaikuCD
diff --git a/build/jam/HaikuImage b/build/jam/images/HaikuImage
similarity index 100%
rename from build/jam/HaikuImage
rename to build/jam/images/HaikuImage
diff --git a/build/jam/NetBootArchive b/build/jam/images/NetBootArchive
similarity index 100%
rename from build/jam/NetBootArchive
rename to build/jam/images/NetBootArchive
############################################################################
Commit: 2bab2851aa2b67798f34ea35b8b6c04e6a0afba4
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Sun Jul 7 08:49:20 2013 UTC
Remove OptionLibPackages
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalLibPackages b/build/jam/OptionalLibPackages
deleted file mode 100644
index 7344a2b..0000000
--- a/build/jam/OptionalLibPackages
+++ /dev/null
@@ -1,286 +0,0 @@
-# This file defines the optional lib packages that can be added to the Haiku
image.
-# It is directly included from HaikuImage -- all variables defined there can
-# be used
-
-
-# Available Optional Lib Packages:
-# AllegroLibs
-# box2d
-# fribidi
-# lcms
-# libart_lgpl
-# libmad
-# libmikmod
-# libmodplug
-# libpaper
-# physfs
-# SDLLibs
-# XiphLibs
-
-
-local baseURL = http://haiku-files.org/files/optional-packages ;
-local baseSourceURL = http://haiku-files.org/files/sources ;
-
-
-# AllegroLibs
-if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] {
- # libsdl and related libs
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package AllegroLibs available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/allegro-4.4.1.1-r1a4-x86-gcc4-2012-09-09.zip ;
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/dumb-0.9.3-r1a4-x86-gcc4-2012-09-09.zip ;
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/jgmod-0.99-r1a4-x86-gcc4-2012-09-09.zip ;
- } else {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/allegro-4.4.1.1-r1a4-x86-gcc2-2012-08-30.zip ;
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/dumb-0.9.3-r1a4-x86-gcc2-2012-08-30.zip ;
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/jgmod-0.99-r1a4-x86-gcc2-2012-08-30.zip ;
- }
-}
-
-
-# box2d
-if [ IsOptionalHaikuImagePackageAdded box2d ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package box2d available for $(TARGET_ARCH)" ;
- } else {
- if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/box2d-2.1.2-r1a4-x86-gcc4-2012-09-09.zip
- : : cdPackage ;
- } else {
- Echo "No optional package box2d available for
$(TARGET_ARCH)-gcc2" ;
- }
- }
-}
-
-
-# fribidi
-if [ IsOptionalHaikuImagePackageAdded fribidi ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package fribidi available for $(TARGET_ARCH)"
;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/fribidi-0.19.2-r1a4-x86-gcc4-2012-09-01.zip
- : : cdPackage ;
- } else {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/fribidi-0.19.2-r1a4-x86-gcc2-2012-08-29.zip
- : : cdPackage ;
- }
-}
-
-
-# lcms
-if [ IsOptionalHaikuImagePackageAdded lcms ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package lcms available for $(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/lcms-2.1-r1a4-x86-gcc4-2012-09-02.zip
- : : cdPackage ;
- } else {
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/lcms-2.1-r1a4-x86-gcc2-2012-08-29.zip
- : : cdPackage ;
- }
-}
-
-
-# libart_lgpl
-if [ IsOptionalHaikuImagePackageAdded libart_lgpl ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package libart_lgpl available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libart_lgpl-2.3.21-r1a4-x86-gcc4-2012-09-02.zip
- : : cdPackage ;
- } else {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libart_lgpl-2.3.21-r1a4-x86-gcc2-2012-08-29.zip
- : : cdPackage ;
- }
-}
-
-
-# libmad
-if [ IsOptionalHaikuImagePackageAdded libmad ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package libmad available for $(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libmad-0.15.1b-r1a4-x86-gcc4-2012-09-02.zip
- : : cdPackage ;
- } else {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libmad-0.15.1b-r1a4-x86-gcc2-2012-08-29.zip
- : : cdPackage ;
- }
-}
-
-
-# libmikmod
-if [ IsOptionalHaikuImagePackageAdded libmikmod ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package libmikmod available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libmikmod-3.1.11-r1a4-x86-gcc4-2012-09-02.zip
- : : cdPackage ;
- } else {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libmikmod-3.1.11-r1a4-x86-gcc2-2012-08-29.zip
- : : cdPackage ;
- }
-}
-
-
-# libmodplug
-if [ IsOptionalHaikuImagePackageAdded libmodplug ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package libmodplug available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libmodplug-0.8.8.4-r1a4-x86-gcc4-2012-09-02.zip
- : : cdPackage ;
- } else {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libmodplug-0.8.8.4-r1a4-x86-gcc2-2012-08-29.zip
- : : cdPackage ;
- }
-}
-
-
-# libpaper
-if [ IsOptionalHaikuImagePackageAdded libpaper ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package libpaper available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libpaper-1.1.24-r1a4-x86-gcc4-2012-09-01.zip
- : : cdPackage ;
- } else {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libpaper-1.1.24-r1a4-x86-gcc4-2012-09-01.zip
- : : cdPackage ;
- }
-}
-
-
-# physfs
-if [ IsOptionalHaikuImagePackageAdded physfs ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package physfs available for $(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/physfs-2.0.1-r1a4-x86-gcc4-2012-09-09.zip
- : : cdPackage ;
- } else {
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/physfs-2.0.1-r1a4-x86-gcc2-2012-08-29.zip
- : : cdPackage ;
- }
-}
-
-
-# SDLLibs
-if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package SDLLibs available for $(TARGET_ARCH)"
;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libsdl-1.2.15-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/guilib-1.2.1-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/sdl-gfx-2.0.23-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/sdl-image-1.2.12-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/sdl-mixer-1.2.11-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/sdl-net-1.2.8-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/sdl-sound-1.0.3-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/sdl-rtf-0.1.0-r1a4-x86-gcc4-2012-09-03.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/sdl-ttf-2.0.11-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/sge-030809-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/smjpeg-0.2.1-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/smpeg-0.4.5-r1a4-x86-gcc4-2012-09-02.zip
;
- } else {
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libsdl-1.2.15-r1a4-x86-gcc2-2012-08-29.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/guilib-1.2.1-r1a4-x86-gcc2-2012-08-29.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/sdl-gfx-2.0.23-r1a4-x86-gcc2-2012-08-29.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/sdl-image-1.2.12-r1a4-x86-gcc2-2012-08-29.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/sdl-mixer-1.2.11-r1a4-x86-gcc2-2012-08-29.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/sdl-net-1.2.8-r1a4-x86-gcc2-2012-08-29.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/sdl-sound-1.0-hg-r1a4-x86-gcc2-2012-08-30.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/sdl-rtf-0.1.0-r1a3-x86-gcc2-2011-05-20.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/sdl-ttf-2.0.11-r1a4-x86-gcc2-2012-08-29.zip ;
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/sge-030809-r1a4-x86-gcc2-2012-08-29.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/smjpeg-0.2.1-r1a4-x86-gcc2-2012-08-29.zip ;
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/smpeg-0.4.5-r1a4-x86-gcc2-2012-08-29.zip
;
- }
-}
-
-
-# XiphLibs
-if [ IsOptionalHaikuImagePackageAdded XiphLibs ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package XiphLibs available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/flac-1.2.1-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/libao-1.0.0-r1a4-x86-gcc4-2012-09-02.zip
;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libogg-1.3.0-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libtheora-1.1.1-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libvorbis-1.3.2-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/speex-1.2rc1-r1a4-x86-gcc4-2012-09-02.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/vorbis-tools-1.4.0-r1a4-x86-gcc4-2012-09-02.zip ;
- } else {
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/flac-1.2.1-r1a4-x86-gcc2-2012-08-29.zip ;
- InstallOptionalHaikuImagePackage
- $(baseURL)/lib/libao-1.0.0-r1a4-x86-gcc2-2012-08-29.zip
;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libogg-1.3.0-r1a4-x86-gcc2-2012-08-29.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libtheora-1.1.1-r1a4-x86-gcc2-2012-08-29.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/libvorbis-1.3.2-r1a4-x86-gcc2-2012-08-29.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/speex-1.2rc1-r1a4-x86-gcc2-2012-08-29.zip ;
- InstallOptionalHaikuImagePackage
-
$(baseURL)/lib/vorbis-tools-1.4.0-r1a4-x86-gcc2-2012-08-29.zip ;
- }
-}
-
diff --git a/build/jam/images/Haiku64Image b/build/jam/images/Haiku64Image
index 4d4ec6b..0fd57ae 100644
--- a/build/jam/images/Haiku64Image
+++ b/build/jam/images/Haiku64Image
@@ -199,8 +199,7 @@ AddFilesToHaikuImage system bin :
install-wifi-firmwares.sh ;
# Add the files to be used by installoptionalpackage.
AddDirectoryToHaikuImage common data optional-packages ;
-local optional-pkg-files = BuildFeatures OptionalPackageDependencies
- OptionalPackages OptionalLibPackages ;
+local optional-pkg-files = BuildFeatures OptionalPackages ;
for name in $(optional-pkg-files) {
local file = [ FDirName $(HAIKU_TOP) build jam $(name) ] ;
AddFilesToHaikuImage common data optional-packages : $(file) ;
@@ -453,7 +452,6 @@ HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS = ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackages ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalTestPackages ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalLibPackages ] ;
local optionalPackageDescriptions ;
if $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) {
diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage
index f029a8c..f1a65e7 100644
--- a/build/jam/images/HaikuImage
+++ b/build/jam/images/HaikuImage
@@ -324,7 +324,6 @@ HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS = ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackages ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalTestPackages ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalLibPackages ] ;
local optionalPackageDescriptions ;
if $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) {
Other related posts:
- » [haiku-commits] BRANCH HaikuPM-github.package-management [2bab285] in build/jam: . images - HaikuPM-github . package-management