[haiku-commits] BRANCH HaikuPM-github.package-management [0c66189] build/jam src/kits/package
- From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 1 May 2013 02:15:30 +0200 (CEST)
added 3 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: 7cbdf4f0231a0901bd1a18c3be8cc267f2e9c3e6
new head: 0c661892d459501ef82b1ccd88c7ea4b0c24fc20
overview: https://github.com/haiku/HaikuPM/compare/7cbdf4f...0c66189
----------------------------------------------------------------------------
6c6d649: ExtractArchive rule: Allow the directory to have a grist
98a0dd5: Update ICU packages
We extract both packages to the same directory now, since the icu_devel
package depends on the base package and contains relative symlinks to
the libraries. ATM that isn't really relevant, since we link directly
against the libraries from the base package, but we might want to
change that eventually.
0c66189: BPackageInfo::Parser: Fix error output
The "=" operator isn't actually allowed in a resolvable expression. It
has to be "==" instead.
[ Ingo Weinhold <ingo_weinhold@xxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 13 insertions(+), 10 deletions(-)
build/jam/FileRules | 2 +-
build/jam/OptionalBuildFeatures | 17 ++++++++++-------
src/kits/package/PackageInfo.cpp | 4 ++--
############################################################################
Commit: 6c6d6490bfa0b6cff6d018e86db189e412abc82d
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed May 1 00:01:44 2013 UTC
ExtractArchive rule: Allow the directory to have a grist
----------------------------------------------------------------------------
diff --git a/build/jam/FileRules b/build/jam/FileRules
index ccb883d..0f466c6 100644
--- a/build/jam/FileRules
+++ b/build/jam/FileRules
@@ -220,7 +220,7 @@ rule ExtractArchive directory : entries : archiveFile :
grist
targets += $(target) ;
}
- LOCATE on $(targets) = $(directory) ;
+ LOCATE on $(targets) = $(directory:G=) ;
Depends $(targets) : $(directory) $(archiveFile) ;
NoUpdate $(targets) ;
############################################################################
Commit: 98a0dd5fd86042f9c736e26d3e3637953fe177a2
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed May 1 00:02:56 2013 UTC
Update ICU packages
We extract both packages to the same directory now, since the icu_devel
package depends on the base package and contains relative symlinks to
the libraries. ATM that isn't really relevant, since we link directly
against the libraries from the base package, but we might want to
change that eventually.
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index cffb525..e3e6df0 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -57,11 +57,12 @@ if $(HAIKU_BUILD_FEATURE_SSL) {
# ICU
# Note ICU isn't actually optional, but is still an external package
-HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1.1-1-x86_gcc2.hpkg ;
+HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1.1-2-x86_gcc2.hpkg ;
HAIKU_ICU_GCC_4_PACKAGE = icu-4.8.1-x86-gcc4-2011-11-02.zip ;
# TODO: Make hpkg!
HAIKU_ICU_PPC_PACKAGE = icu-4.8.1-ppc-2011-08-20.zip ;
-HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1-1-any.hpkg ;
+HAIKU_ICU_DEVEL_PACKAGE = icu_devel-4.8.1.1-2-x86_gcc2.hpkg ;
+ # TODO: The devel package is no longer architecture independent!
if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
local icu_package ;
@@ -117,16 +118,18 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
# zip file and output directory
HAIKU_ICU_DEVEL_ZIP_FILE = [ DownloadFile $(HAIKU_ICU_DEVEL_PACKAGE)
: $(hpkgBaseURL)/$(HAIKU_ICU_DEVEL_PACKAGE) ] ;
-HAIKU_ICU_DEVEL_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
- $(HAIKU_ICU_DEVEL_PACKAGE:B) ] ;
+HAIKU_ICU_DEVEL_DIR = $(HAIKU_ICU_DIR) ;
# extract headers
-HAIKU_ICU_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_ICU_DEVEL_DIR)
- : develop/headers/3rdparty : $(HAIKU_ICU_DEVEL_ZIP_FILE)
+HAIKU_ICU_HEADERS_DEPENDENCY = [ ExtractArchive
+ $(HAIKU_ICU_DEVEL_DIR:G=icu_devel)
+ # We need a grist here, so it's a different target than the one
for the
+ # main package, even though it's the same directory.
+ : develop/headers : $(HAIKU_ICU_DEVEL_ZIP_FILE)
: extracted-icu-devel ] ;
HAIKU_ICU_HEADERS
- = [ FDirName $(HAIKU_ICU_DEVEL_DIR) develop headers 3rdparty ] ;
+ = [ FDirName $(HAIKU_ICU_DEVEL_DIR) develop headers ] ;
# CLucene
############################################################################
Commit: 0c661892d459501ef82b1ccd88c7ea4b0c24fc20
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed May 1 00:08:43 2013 UTC
BPackageInfo::Parser: Fix error output
The "=" operator isn't actually allowed in a resolvable expression. It
has to be "==" instead.
----------------------------------------------------------------------------
diff --git a/src/kits/package/PackageInfo.cpp b/src/kits/package/PackageInfo.cpp
index 430bef1..7175b68 100644
--- a/src/kits/package/PackageInfo.cpp
+++ b/src/kits/package/PackageInfo.cpp
@@ -744,8 +744,8 @@ BPackageInfo::Parser::_ParseResolvableExprList(
parser._RewindTo(op);
} else {
throw ParseError(
- "expected '<', '<=', '=', '==', '!=',
'>=', '>', comma or "
- "'}'", op.pos);
+ "expected '<', '<=', '==', '!=', '>=',
'>', comma or '}'",
+ op.pos);
}
BPackageResolvableOperator resolvableOperator
Other related posts:
- » [haiku-commits] BRANCH HaikuPM-github.package-management [0c66189] build/jam src/kits/package - HaikuPM-github . package-management
