From 872e7aa2a66c6d843335d42e6412e1236c445e19 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 4 Jun 2013 22:37:59 +0200 Subject: [PATCH] Rename haiku_cross_devel packages. * haiku_cross_devel is now haiku_cross_devel_sysroot * haiku_cross_devel_wrapper is now haiku_cross_devel --- build/jam/packages/HaikuCrossDevel | 17 ++++++++------- .../package_infos/generic/haiku_cross_devel | 8 +++---- .../generic/haiku_cross_devel_sysroot | 21 +++++++++++++++++++ .../generic/haiku_cross_devel_wrapper | 21 ------------------- 4 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 src/data/package_infos/generic/haiku_cross_devel_sysroot delete mode 100644 src/data/package_infos/generic/haiku_cross_devel_wrapper diff --git a/build/jam/packages/HaikuCrossDevel b/build/jam/packages/HaikuCrossDevel index 122fb839e8..fd09cadc63 100644 --- a/build/jam/packages/HaikuCrossDevel +++ b/build/jam/packages/HaikuCrossDevel @@ -6,8 +6,9 @@ # first create the actual cross development package -local haikuCrossDevelPackage = haiku_cross_devel_$(HAIKU_PACKAGING_ARCH).hpkg ; -HaikuPackage $(haikuCrossDevelPackage) ; +local haikuCrossDevelSysrootPackage + = haiku_cross_devel_sysroot_$(HAIKU_PACKAGING_ARCH).hpkg ; +HaikuPackage $(haikuCrossDevelSysrootPackage) ; local developCrossLibDirTokens = develop lib ; @@ -56,19 +57,19 @@ if $(HAIKU_GCC_VERSION[1]) = 2 { : [ FDirName $(HAIKU_TOP) headers cpp ] : 2.95.3 ; } -BuildHaikuPackage $(haikuCrossDevelPackage) : haiku_cross_devel ; +BuildHaikuPackage $(haikuCrossDevelSysrootPackage) : haiku_cross_devel_sysroot ; # Now create a wrapper package which just contains the actual cross development # package. This wrapper package can safely be installed into the system # hierarchy of the target system, from where haikuporter will fetch it when # needed. -local haikuCrossDevelWrapperPackage - = haiku_cross_devel_wrapper_$(HAIKU_PACKAGING_ARCH).hpkg ; -HaikuPackage $(haikuCrossDevelWrapperPackage) ; +local haikuCrossDevelPackage + = haiku_cross_devel_$(HAIKU_PACKAGING_ARCH).hpkg ; +HaikuPackage $(haikuCrossDevelPackage) ; # add the wrapped package local developCrossDirTokens = develop cross ; -AddFilesToPackage $(developCrossDirTokens) : $(haikuCrossDevelPackage) ; +AddFilesToPackage $(developCrossDirTokens) : $(haikuCrossDevelSysrootPackage) ; -BuildHaikuPackage $(haikuCrossDevelWrapperPackage) : haiku_cross_devel_wrapper ; +BuildHaikuPackage $(haikuCrossDevelPackage) : haiku_cross_devel ; diff --git a/src/data/package_infos/generic/haiku_cross_devel b/src/data/package_infos/generic/haiku_cross_devel index d91b0b385f..5873b1fba2 100644 --- a/src/data/package_infos/generic/haiku_cross_devel +++ b/src/data/package_infos/generic/haiku_cross_devel @@ -4,11 +4,11 @@ name haiku_cross_devel version R1~alpha4_pm-1 architecture any -summary "The Haiku base system files for cross development" +summary "Contains a package with system files for cross development" -description "The package contains all files associated with the base \ -system needed for cross development, like static libraries, glue code, \ -library symlinks, header files, etc." +description "This package provides a package that contains all files \ +associated with the base system needed for cross development, like static \ +libraries, glue code, library symlinks, header files, etc." packager "The Haiku build system" vendor "Haiku Project" diff --git a/src/data/package_infos/generic/haiku_cross_devel_sysroot b/src/data/package_infos/generic/haiku_cross_devel_sysroot new file mode 100644 index 0000000000..9745abe144 --- /dev/null +++ b/src/data/package_infos/generic/haiku_cross_devel_sysroot @@ -0,0 +1,21 @@ +#define DO_CONCAT(a, b) a ## b +#define CONCAT(a, b) DO_CONCAT(a, b) + +name haiku_cross_devel_sysroot +version R1~alpha4_pm-1 +architecture any +summary "The Haiku base system files for cross development" + +description "The package contains all files associated with the base \ +system needed for cross development, like static libraries, glue code, \ +library symlinks, header files, etc." + +packager "The Haiku build system" +vendor "Haiku Project" + +copyrights "2001-2013 Haiku, Inc. et al" +licenses "MIT" + +provides { + CONCAT(haiku_cross_devel_sysroot_, HAIKU_PACKAGING_ARCH) = R1~alpha4_pm-1 +} diff --git a/src/data/package_infos/generic/haiku_cross_devel_wrapper b/src/data/package_infos/generic/haiku_cross_devel_wrapper deleted file mode 100644 index e3fbc826b7..0000000000 --- a/src/data/package_infos/generic/haiku_cross_devel_wrapper +++ /dev/null @@ -1,21 +0,0 @@ -#define DO_CONCAT(a, b) a ## b -#define CONCAT(a, b) DO_CONCAT(a, b) - -name haiku_cross_devel_wrapper -version R1~alpha4_pm-1 -architecture any -summary "Contains a package with system files for cross development" - -description "This package provides a package that contains all files \ -associated with the base system needed for cross development, like static \ -libraries, glue code, library symlinks, header files, etc." - -packager "The Haiku build system" -vendor "Haiku Project" - -copyrights "2001-2013 Haiku, Inc. et al" -licenses "MIT" - -provides { - CONCAT(haiku_cross_devel_wrapper_, HAIKU_PACKAGING_ARCH) = R1~alpha4_pm-1 -}