From 897d5af7ff716051d07775bc8d8ad3f894d20e37 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 6 Oct 2013 01:37:13 +0200 Subject: [PATCH] Don't code the Haiku version into all the package infos --- build/jam/PackageRules | 1 + src/data/package_infos/any/haiku_userguide | 4 ++-- src/data/package_infos/any/haiku_welcome | 4 ++-- src/data/package_infos/any/makefile_engine | 4 ++-- src/data/package_infos/arm/haiku | 4 ++-- src/data/package_infos/generic/haiku_cross_devel | 4 ++-- src/data/package_infos/generic/haiku_cross_devel_sysroot | 4 ++-- src/data/package_infos/generic/haiku_devel | 6 +++--- src/data/package_infos/generic/haiku_devel_secondary | 8 ++++---- src/data/package_infos/generic/haiku_loader | 4 ++-- src/data/package_infos/generic/webpositive | 4 ++-- src/data/package_infos/m68k/haiku | 4 ++-- src/data/package_infos/ppc/haiku | 4 ++-- src/data/package_infos/x86/haiku | 4 ++-- src/data/package_infos/x86/haiku_secondary | 4 ++-- src/data/package_infos/x86_64/haiku | 4 ++-- src/data/package_infos/x86_64/haiku_secondary | 4 ++-- src/data/package_infos/x86_gcc2/haiku | 4 ++-- src/data/package_infos/x86_gcc2/haiku_secondary | 4 ++-- 19 files changed, 40 insertions(+), 39 deletions(-) diff --git a/build/jam/PackageRules b/build/jam/PackageRules index d2fd03b6bf..922fb7f588 100644 --- a/build/jam/PackageRules +++ b/build/jam/PackageRules @@ -42,6 +42,7 @@ rule PreprocessPackageInfo source : directory : architecture local target = $(source:BSG=package-info)-package-info ; local defines = HAIKU_PACKAGING_ARCH=$(architecture) ; local sedReplacements = %HAIKU_PACKAGING_ARCH%,$(architecture) ; + sedReplacements += %HAIKU_VERSION%,R1~alpha4_pm-1 ; if $(HAIKU_BOOTSTRAP_BUILD) { defines += HAIKU_BOOTSTRAP_BUILD ; target = $(target)-bootstrap ; diff --git a/src/data/package_infos/any/haiku_userguide b/src/data/package_infos/any/haiku_userguide index 3edc54f532..965d5c3054 100644 --- a/src/data/package_infos/any/haiku_userguide +++ b/src/data/package_infos/any/haiku_userguide @@ -1,5 +1,5 @@ name haiku_userguide -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture any summary "The Haiku user documentation" description "The Haiku user documentation." @@ -11,7 +11,7 @@ copyrights "2001-2013 Haiku, Inc. et al" licenses MIT provides { - haiku_userguide=R1~alpha4_pm-1 + haiku_userguide=%HAIKU_VERSION% } requires { diff --git a/src/data/package_infos/any/haiku_welcome b/src/data/package_infos/any/haiku_welcome index 53cf0eaca0..97f731fb40 100644 --- a/src/data/package_infos/any/haiku_welcome +++ b/src/data/package_infos/any/haiku_welcome @@ -1,5 +1,5 @@ name haiku_welcome -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture any summary "The Haiku welcome documentation" description "The Haiku welcome documentation for new users." @@ -11,7 +11,7 @@ copyrights "2001-2013 Haiku, Inc. et al" licenses "MIT" provides { - haiku_welcome=R1~alpha4_pm-1 + haiku_welcome=%HAIKU_VERSION% } requires { diff --git a/src/data/package_infos/any/makefile_engine b/src/data/package_infos/any/makefile_engine index 61f1c1665d..bd89be3b8d 100644 --- a/src/data/package_infos/any/makefile_engine +++ b/src/data/package_infos/any/makefile_engine @@ -1,5 +1,5 @@ name makefile_engine -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture any summary "The makefile engine" description "A simple generic makefile engine and makefile template." @@ -11,7 +11,7 @@ copyrights "? Be Inc. 2001-2013 Haiku, Inc." licenses MIT provides { - makefile_engine=R1~alpha4_pm-1 + makefile_engine=%HAIKU_VERSION% } requires { diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku index 46f023da08..75a3f4ac8e 100644 --- a/src/data/package_infos/arm/haiku +++ b/src/data/package_infos/arm/haiku @@ -1,5 +1,5 @@ name haiku -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture arm summary "The Haiku base system" @@ -16,7 +16,7 @@ licenses { } provides { - haiku=R1~alpha4_pm-1 compat>=R1~alpha1 + haiku=%HAIKU_VERSION% compat>=R1~alpha1 coreutils = 8.4 compat >= 0 diffutils = 2.8.1 compat >= 0 findutils = 4.2.33 compat >= 0 diff --git a/src/data/package_infos/generic/haiku_cross_devel b/src/data/package_infos/generic/haiku_cross_devel index bd3aa1a3da..90806a8e8b 100644 --- a/src/data/package_infos/generic/haiku_cross_devel +++ b/src/data/package_infos/generic/haiku_cross_devel @@ -1,5 +1,5 @@ name haiku_cross_devel -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture any summary "Contains a package with system files for cross development" @@ -14,5 +14,5 @@ copyrights "2001-2013 Haiku, Inc. et al" licenses "MIT" provides { - haiku_cross_devel_%HAIKU_PACKAGING_ARCH% = R1~alpha4_pm-1 + haiku_cross_devel_%HAIKU_PACKAGING_ARCH% = %HAIKU_VERSION% } diff --git a/src/data/package_infos/generic/haiku_cross_devel_sysroot b/src/data/package_infos/generic/haiku_cross_devel_sysroot index 3d9cf6c78c..b6aebeab5f 100644 --- a/src/data/package_infos/generic/haiku_cross_devel_sysroot +++ b/src/data/package_infos/generic/haiku_cross_devel_sysroot @@ -1,5 +1,5 @@ name haiku_cross_devel_sysroot -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture any summary "The Haiku base system files for cross development" @@ -14,5 +14,5 @@ copyrights "2001-2013 Haiku, Inc. et al" licenses "MIT" provides { - haiku_cross_devel_sysroot_%HAIKU_PACKAGING_ARCH% = R1~alpha4_pm-1 + haiku_cross_devel_sysroot_%HAIKU_PACKAGING_ARCH% = %HAIKU_VERSION% } diff --git a/src/data/package_infos/generic/haiku_devel b/src/data/package_infos/generic/haiku_devel index 2945db7267..fc266c07ee 100644 --- a/src/data/package_infos/generic/haiku_devel +++ b/src/data/package_infos/generic/haiku_devel @@ -1,5 +1,5 @@ name haiku_devel -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture %HAIKU_PACKAGING_ARCH% summary "The Haiku base system development files" @@ -14,9 +14,9 @@ copyrights "2001-2013 Haiku, Inc. et al" licenses "MIT" provides { - haiku_devel = R1~alpha4_pm-1 compat >= R1~alpha1 + haiku_devel = %HAIKU_VERSION% compat >= R1~alpha1 } requires { - haiku == R1~alpha4_pm-1 base + haiku == %HAIKU_VERSION% base } diff --git a/src/data/package_infos/generic/haiku_devel_secondary b/src/data/package_infos/generic/haiku_devel_secondary index 66b5304f49..9fc247fc3c 100644 --- a/src/data/package_infos/generic/haiku_devel_secondary +++ b/src/data/package_infos/generic/haiku_devel_secondary @@ -1,5 +1,5 @@ name haiku_%HAIKU_SECONDARY_PACKAGING_ARCH%_devel -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture HAIKU_PACKAGING_ARCH 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" 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 { - haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% == R1~alpha4_pm-1 base - haiku_devel == R1~alpha4_pm-1 + haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% == %HAIKU_VERSION% base + haiku_devel == %HAIKU_VERSION% } diff --git a/src/data/package_infos/generic/haiku_loader b/src/data/package_infos/generic/haiku_loader index b70f3eb7c8..df87d88e97 100644 --- a/src/data/package_infos/generic/haiku_loader +++ b/src/data/package_infos/generic/haiku_loader @@ -1,5 +1,5 @@ name haiku_loader -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture %HAIKU_PACKAGING_ARCH% summary "The Haiku boot loader" description "The Haiku boot loader." @@ -11,7 +11,7 @@ copyrights "2001-2013 Haiku, Inc. et al" licenses "MIT" provides { - haiku_loader=R1~alpha4_pm-1 + haiku_loader=%HAIKU_VERSION% } requires { diff --git a/src/data/package_infos/generic/webpositive b/src/data/package_infos/generic/webpositive index 70b487a5e3..74e6fac864 100644 --- a/src/data/package_infos/generic/webpositive +++ b/src/data/package_infos/generic/webpositive @@ -1,5 +1,5 @@ name webpositive%HAIKU_SECONDARY_PACKAGING_ARCH_SUFFIX% -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture HAIKU_PACKAGING_ARCH summary "A WebKit based web browser for Haiku" @@ -12,7 +12,7 @@ copyrights "2001-2013 Haiku, Inc. et al" licenses "MIT" provides { - webpositive%HAIKU_SECONDARY_PACKAGING_ARCH_SUFFIX% = R1~alpha4_pm-1 + webpositive%HAIKU_SECONDARY_PACKAGING_ARCH_SUFFIX% = %HAIKU_VERSION% } requires { diff --git a/src/data/package_infos/m68k/haiku b/src/data/package_infos/m68k/haiku index 4b8e65f781..11c3805a20 100644 --- a/src/data/package_infos/m68k/haiku +++ b/src/data/package_infos/m68k/haiku @@ -1,5 +1,5 @@ name haiku -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture m68k summary "The Haiku base system" @@ -16,7 +16,7 @@ licenses { } provides { - haiku=R1~alpha4_pm-1 compat>=R1~alpha1 + haiku=%HAIKU_VERSION% compat>=R1~alpha1 coreutils = 8.4 compat >= 0 diffutils = 2.8.1 compat >= 0 findutils = 4.2.33 compat >= 0 diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku index 9e570db779..1a8cee9745 100644 --- a/src/data/package_infos/ppc/haiku +++ b/src/data/package_infos/ppc/haiku @@ -1,5 +1,5 @@ name haiku -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture ppc summary "The Haiku base system" @@ -16,7 +16,7 @@ licenses { } provides { - haiku=R1~alpha4_pm-1 compat>=R1~alpha1 + haiku=%HAIKU_VERSION% compat>=R1~alpha1 coreutils = 8.4 compat >= 0 diffutils = 2.8.1 compat >= 0 findutils = 4.2.33 compat >= 0 diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku index 5557343e87..e55825febf 100644 --- a/src/data/package_infos/x86/haiku +++ b/src/data/package_infos/x86/haiku @@ -1,5 +1,5 @@ name haiku -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture x86 summary "The Haiku base system" @@ -16,7 +16,7 @@ licenses { } provides { - haiku=R1~alpha4_pm-1 compat>=R1~alpha1 + haiku=%HAIKU_VERSION% compat>=R1~alpha1 coreutils = 8.4 compat >= 0 diffutils = 2.8.1 compat >= 0 findutils = 4.2.33 compat >= 0 diff --git a/src/data/package_infos/x86/haiku_secondary b/src/data/package_infos/x86/haiku_secondary index 8a32b1af0e..a5972a31d3 100644 --- a/src/data/package_infos/x86/haiku_secondary +++ b/src/data/package_infos/x86/haiku_secondary @@ -1,5 +1,5 @@ name haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture x86 summary "The Haiku base system %HAIKU_SECONDARY_PACKAGING_ARCH% secondary architecture support" @@ -17,7 +17,7 @@ licenses { } provides { - haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% = R1~alpha4_pm-1 compat>=R1~alpha1 + haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% = %HAIKU_VERSION% compat>=R1~alpha1 } requires { diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku index 2bd8c3a4a2..87a73ba13b 100644 --- a/src/data/package_infos/x86_64/haiku +++ b/src/data/package_infos/x86_64/haiku @@ -1,5 +1,5 @@ name haiku -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture x86_64 summary "The Haiku base system" @@ -16,7 +16,7 @@ licenses { } provides { - haiku=R1~alpha4_pm-1 compat>=R1~alpha1 + haiku=%HAIKU_VERSION% compat>=R1~alpha1 coreutils = 8.4 compat >= 0 diffutils = 2.8.1 compat >= 0 findutils = 4.2.33 compat >= 0 diff --git a/src/data/package_infos/x86_64/haiku_secondary b/src/data/package_infos/x86_64/haiku_secondary index 048a1d8725..b0a2576df0 100644 --- a/src/data/package_infos/x86_64/haiku_secondary +++ b/src/data/package_infos/x86_64/haiku_secondary @@ -1,5 +1,5 @@ name haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture x86_64 summary "The Haiku base system %HAIKU_SECONDARY_PACKAGING_ARCH% secondary architecture support" @@ -17,7 +17,7 @@ licenses { } provides { - haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% = R1~alpha4_pm-1 compat>=R1~alpha1 + haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% = %HAIKU_VERSION% compat>=R1~alpha1 } requires { diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku index 381a9d09c9..7cbc601a07 100644 --- a/src/data/package_infos/x86_gcc2/haiku +++ b/src/data/package_infos/x86_gcc2/haiku @@ -1,5 +1,5 @@ name haiku -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture x86_gcc2 summary "The Haiku base system" @@ -16,7 +16,7 @@ licenses { } provides { - haiku=R1~alpha4_pm-1 compat>=R1~alpha1 + haiku=%HAIKU_VERSION% compat>=R1~alpha1 coreutils = 8.4 compat >= 0 diffutils = 2.8.1 compat >= 0 findutils = 4.2.33 compat >= 0 diff --git a/src/data/package_infos/x86_gcc2/haiku_secondary b/src/data/package_infos/x86_gcc2/haiku_secondary index b64ad70a35..37c8c04b33 100644 --- a/src/data/package_infos/x86_gcc2/haiku_secondary +++ b/src/data/package_infos/x86_gcc2/haiku_secondary @@ -1,5 +1,5 @@ name haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% -version R1~alpha4_pm-1 +version %HAIKU_VERSION% architecture x86_gcc2 summary "The Haiku base system %HAIKU_SECONDARY_PACKAGING_ARCH% secondary architecture support" @@ -17,7 +17,7 @@ licenses { } provides { - haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% = R1~alpha4_pm-1 compat>=R1~alpha1 + haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% = %HAIKU_VERSION% compat>=R1~alpha1 } requires {