i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't code the Haiku version into all the package infos

Browse Source
This commit is contained in:
Ingo Weinhold
2013-10-06 01:37:13 +02:00
parent 635d2ac485
commit 897d5af7ff
19 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/PackageRules
+1
View File
@@ -42,6 +42,7 @@ rule PreprocessPackageInfo source : directory : architecture
local target = $(source:BSG=package-info)-package-info ; local target = $(source:BSG=package-info)-package-info ;
local defines = HAIKU_PACKAGING_ARCH=$(architecture) ; local defines = HAIKU_PACKAGING_ARCH=$(architecture) ;
local sedReplacements = %HAIKU_PACKAGING_ARCH%,$(architecture) ; local sedReplacements = %HAIKU_PACKAGING_ARCH%,$(architecture) ;
sedReplacements += %HAIKU_VERSION%,R1~alpha4_pm-1 ;
if $(HAIKU_BOOTSTRAP_BUILD) { if $(HAIKU_BOOTSTRAP_BUILD) {
defines += HAIKU_BOOTSTRAP_BUILD ; defines += HAIKU_BOOTSTRAP_BUILD ;
target = $(target)-bootstrap ; target = $(target)-bootstrap ;
src/data/package_infos/any/haiku_userguide
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku_userguide name haiku_userguide
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture any architecture any
summary "The Haiku user documentation" summary "The Haiku user documentation"
description "The Haiku user documentation." description "The Haiku user documentation."
@@ -11,7 +11,7 @@ copyrights "2001-2013 Haiku, Inc. et al"
licenses MIT licenses MIT
provides { provides {
haiku_userguide=R1~alpha4_pm-1 haiku_userguide=%HAIKU_VERSION%
} }
requires { requires {
src/data/package_infos/any/haiku_welcome
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku_welcome name haiku_welcome
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture any architecture any
summary "The Haiku welcome documentation" summary "The Haiku welcome documentation"
description "The Haiku welcome documentation for new users." description "The Haiku welcome documentation for new users."
@@ -11,7 +11,7 @@ copyrights "2001-2013 Haiku, Inc. et al"
licenses "MIT" licenses "MIT"
provides { provides {
haiku_welcome=R1~alpha4_pm-1 haiku_welcome=%HAIKU_VERSION%
} }
requires { requires {
src/data/package_infos/any/makefile_engine
+2 -2
View File
@@ -1,5 +1,5 @@
name makefile_engine name makefile_engine
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture any architecture any
summary "The makefile engine" summary "The makefile engine"
description "A simple generic makefile engine and makefile template." description "A simple generic makefile engine and makefile template."
@@ -11,7 +11,7 @@ copyrights "? Be Inc. 2001-2013 Haiku, Inc."
licenses MIT licenses MIT
provides { provides {
makefile_engine=R1~alpha4_pm-1 makefile_engine=%HAIKU_VERSION%
} }
requires { requires {
src/data/package_infos/arm/haiku
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku name haiku
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture arm architecture arm
summary "The Haiku base system" summary "The Haiku base system"
@@ -16,7 +16,7 @@ licenses {
} }
provides { provides {
haiku=R1~alpha4_pm-1 compat>=R1~alpha1 haiku=%HAIKU_VERSION% compat>=R1~alpha1
coreutils = 8.4 compat >= 0 coreutils = 8.4 compat >= 0
diffutils = 2.8.1 compat >= 0 diffutils = 2.8.1 compat >= 0
findutils = 4.2.33 compat >= 0 findutils = 4.2.33 compat >= 0
src/data/package_infos/generic/haiku_cross_devel
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku_cross_devel name haiku_cross_devel
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture any architecture any
summary "Contains a package with system files for cross development" summary "Contains a package with system files for cross development"
@@ -14,5 +14,5 @@ copyrights "2001-2013 Haiku, Inc. et al"
licenses "MIT" licenses "MIT"
provides { provides {
haiku_cross_devel_%HAIKU_PACKAGING_ARCH% = R1~alpha4_pm-1 haiku_cross_devel_%HAIKU_PACKAGING_ARCH% = %HAIKU_VERSION%
} }
src/data/package_infos/generic/haiku_cross_devel_sysroot
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku_cross_devel_sysroot name haiku_cross_devel_sysroot
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture any architecture any
summary "The Haiku base system files for cross development" summary "The Haiku base system files for cross development"
@@ -14,5 +14,5 @@ copyrights "2001-2013 Haiku, Inc. et al"
licenses "MIT" licenses "MIT"
provides { provides {
haiku_cross_devel_sysroot_%HAIKU_PACKAGING_ARCH% = R1~alpha4_pm-1 haiku_cross_devel_sysroot_%HAIKU_PACKAGING_ARCH% = %HAIKU_VERSION%
} }
src/data/package_infos/generic/haiku_devel
+3 -3
View File
@@ -1,5 +1,5 @@
name haiku_devel name haiku_devel
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture %HAIKU_PACKAGING_ARCH% architecture %HAIKU_PACKAGING_ARCH%
summary "The Haiku base system development files" summary "The Haiku base system development files"
@@ -14,9 +14,9 @@ copyrights "2001-2013 Haiku, Inc. et al"
licenses "MIT" licenses "MIT"
provides { provides {
haiku_devel = R1~alpha4_pm-1 compat >= R1~alpha1 haiku_devel = %HAIKU_VERSION% compat >= R1~alpha1
} }
requires { requires {
haiku == R1~alpha4_pm-1 base haiku == %HAIKU_VERSION% base
} }
src/data/package_infos/generic/haiku_devel_secondary
+4 -4
View File
@@ -1,5 +1,5 @@
name haiku_%HAIKU_SECONDARY_PACKAGING_ARCH%_devel name haiku_%HAIKU_SECONDARY_PACKAGING_ARCH%_devel
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture HAIKU_PACKAGING_ARCH architecture HAIKU_PACKAGING_ARCH
summary "The Haiku base system %HAIKU_SECONDARY_PACKAGING_ARCH% secondary architecture development files" summary "The Haiku base system %HAIKU_SECONDARY_PACKAGING_ARCH% secondary architecture development files"
@@ -14,10 +14,10 @@ copyrights "2001-2013 Haiku, Inc. et al"
licenses "MIT" licenses "MIT"
provides { provides {
haiku_%HAIKU_SECONDARY_PACKAGING_ARCH%_devel = R1~alpha4_pm-1 compat >= R1~alpha1 haiku_%HAIKU_SECONDARY_PACKAGING_ARCH%_devel = %HAIKU_VERSION% compat >= R1~alpha1
} }
requires { requires {
haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% == R1~alpha4_pm-1 base haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% == %HAIKU_VERSION% base
haiku_devel == R1~alpha4_pm-1 haiku_devel == %HAIKU_VERSION%
} }
src/data/package_infos/generic/haiku_loader
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku_loader name haiku_loader
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture %HAIKU_PACKAGING_ARCH% architecture %HAIKU_PACKAGING_ARCH%
summary "The Haiku boot loader" summary "The Haiku boot loader"
description "The Haiku boot loader." description "The Haiku boot loader."
@@ -11,7 +11,7 @@ copyrights "2001-2013 Haiku, Inc. et al"
licenses "MIT" licenses "MIT"
provides { provides {
haiku_loader=R1~alpha4_pm-1 haiku_loader=%HAIKU_VERSION%
} }
requires { requires {
src/data/package_infos/generic/webpositive
+2 -2
View File
@@ -1,5 +1,5 @@
name webpositive%HAIKU_SECONDARY_PACKAGING_ARCH_SUFFIX% name webpositive%HAIKU_SECONDARY_PACKAGING_ARCH_SUFFIX%
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture HAIKU_PACKAGING_ARCH architecture HAIKU_PACKAGING_ARCH
summary "A WebKit based web browser for Haiku" summary "A WebKit based web browser for Haiku"
@@ -12,7 +12,7 @@ copyrights "2001-2013 Haiku, Inc. et al"
licenses "MIT" licenses "MIT"
provides { provides {
webpositive%HAIKU_SECONDARY_PACKAGING_ARCH_SUFFIX% = R1~alpha4_pm-1 webpositive%HAIKU_SECONDARY_PACKAGING_ARCH_SUFFIX% = %HAIKU_VERSION%
} }
requires { requires {
src/data/package_infos/m68k/haiku
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku name haiku
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture m68k architecture m68k
summary "The Haiku base system" summary "The Haiku base system"
@@ -16,7 +16,7 @@ licenses {
} }
provides { provides {
haiku=R1~alpha4_pm-1 compat>=R1~alpha1 haiku=%HAIKU_VERSION% compat>=R1~alpha1
coreutils = 8.4 compat >= 0 coreutils = 8.4 compat >= 0
diffutils = 2.8.1 compat >= 0 diffutils = 2.8.1 compat >= 0
findutils = 4.2.33 compat >= 0 findutils = 4.2.33 compat >= 0
src/data/package_infos/ppc/haiku
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku name haiku
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture ppc architecture ppc
summary "The Haiku base system" summary "The Haiku base system"
@@ -16,7 +16,7 @@ licenses {
} }
provides { provides {
haiku=R1~alpha4_pm-1 compat>=R1~alpha1 haiku=%HAIKU_VERSION% compat>=R1~alpha1
coreutils = 8.4 compat >= 0 coreutils = 8.4 compat >= 0
diffutils = 2.8.1 compat >= 0 diffutils = 2.8.1 compat >= 0
findutils = 4.2.33 compat >= 0 findutils = 4.2.33 compat >= 0
src/data/package_infos/x86/haiku
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku name haiku
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture x86 architecture x86
summary "The Haiku base system" summary "The Haiku base system"
@@ -16,7 +16,7 @@ licenses {
} }
provides { provides {
haiku=R1~alpha4_pm-1 compat>=R1~alpha1 haiku=%HAIKU_VERSION% compat>=R1~alpha1
coreutils = 8.4 compat >= 0 coreutils = 8.4 compat >= 0
diffutils = 2.8.1 compat >= 0 diffutils = 2.8.1 compat >= 0
findutils = 4.2.33 compat >= 0 findutils = 4.2.33 compat >= 0
src/data/package_infos/x86/haiku_secondary
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% name haiku_%HAIKU_SECONDARY_PACKAGING_ARCH%
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture x86 architecture x86
summary "The Haiku base system %HAIKU_SECONDARY_PACKAGING_ARCH% secondary architecture support" summary "The Haiku base system %HAIKU_SECONDARY_PACKAGING_ARCH% secondary architecture support"
@@ -17,7 +17,7 @@ licenses {
} }
provides { provides {
haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% = R1~alpha4_pm-1 compat>=R1~alpha1 haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% = %HAIKU_VERSION% compat>=R1~alpha1
} }
requires { requires {
src/data/package_infos/x86_64/haiku
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku name haiku
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture x86_64 architecture x86_64
summary "The Haiku base system" summary "The Haiku base system"
@@ -16,7 +16,7 @@ licenses {
} }
provides { provides {
haiku=R1~alpha4_pm-1 compat>=R1~alpha1 haiku=%HAIKU_VERSION% compat>=R1~alpha1
coreutils = 8.4 compat >= 0 coreutils = 8.4 compat >= 0
diffutils = 2.8.1 compat >= 0 diffutils = 2.8.1 compat >= 0
findutils = 4.2.33 compat >= 0 findutils = 4.2.33 compat >= 0
src/data/package_infos/x86_64/haiku_secondary
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% name haiku_%HAIKU_SECONDARY_PACKAGING_ARCH%
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture x86_64 architecture x86_64
summary "The Haiku base system %HAIKU_SECONDARY_PACKAGING_ARCH% secondary architecture support" summary "The Haiku base system %HAIKU_SECONDARY_PACKAGING_ARCH% secondary architecture support"
@@ -17,7 +17,7 @@ licenses {
} }
provides { provides {
haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% = R1~alpha4_pm-1 compat>=R1~alpha1 haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% = %HAIKU_VERSION% compat>=R1~alpha1
} }
requires { requires {
src/data/package_infos/x86_gcc2/haiku
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku name haiku
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture x86_gcc2 architecture x86_gcc2
summary "The Haiku base system" summary "The Haiku base system"
@@ -16,7 +16,7 @@ licenses {
} }
provides { provides {
haiku=R1~alpha4_pm-1 compat>=R1~alpha1 haiku=%HAIKU_VERSION% compat>=R1~alpha1
coreutils = 8.4 compat >= 0 coreutils = 8.4 compat >= 0
diffutils = 2.8.1 compat >= 0 diffutils = 2.8.1 compat >= 0
findutils = 4.2.33 compat >= 0 findutils = 4.2.33 compat >= 0
src/data/package_infos/x86_gcc2/haiku_secondary
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% name haiku_%HAIKU_SECONDARY_PACKAGING_ARCH%
version R1~alpha4_pm-1 version %HAIKU_VERSION%
architecture x86_gcc2 architecture x86_gcc2
summary "The Haiku base system %HAIKU_SECONDARY_PACKAGING_ARCH% secondary architecture support" summary "The Haiku base system %HAIKU_SECONDARY_PACKAGING_ARCH% secondary architecture support"
@@ -17,7 +17,7 @@ licenses {
} }
provides { provides {
haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% = R1~alpha4_pm-1 compat>=R1~alpha1 haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% = %HAIKU_VERSION% compat>=R1~alpha1
} }
requires { requires {