[haiku-commits] haiku: hrev48311 - build/scripts src/bin/package_repo build/jam

From: zooey@xxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sun, 16 Nov 2014 16:01:20 +0100 (CET)
hrev48311 adds 3 changesets to branch 'master'
old head: c87c95791ef7efc2f7ad566824217007e1949d08
new head: 8e77a6439a375b7cc239cb0eb5b574c495a4b623
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=8e77a64+%5Ec87c957

----------------------------------------------------------------------------

f17d87f: Fix #11458, pt.1: invoking jam from source dir does not work.
  
  * Apply change suggested by Ingo: replace LocalDepends with Depends.

532b7b6: Fix #11458, pt.2: invoking jam from source dir does not work.
  
  * Adjust package_repo create command to check if each given package
    exists before adding it to the repository writer and fail with
    an appropriate message when it does not.

8e77a64: Fix #11458, pt.3: invoking jam from source dir does not work.
  
  * Adjust build_haiku_repository script to invoke package_repo without
    -C <dir>, as that is not needed and has the unintended side-effect
    of rendering relative package paths non-functional.

                                    [ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]

----------------------------------------------------------------------------

3 files changed, 6 insertions(+), 3 deletions(-)
build/jam/PackageRules                  | 2 +-
build/scripts/build_haiku_repository    | 3 +--
src/bin/package_repo/command_create.cpp | 4 ++++

############################################################################

Commit:      f17d87fa1729bfb6072d8815adddd8127cc0f657
URL:         http://cgit.haiku-os.org/haiku/commit/?id=f17d87f
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Sun Nov 16 14:55:52 2014 UTC

Ticket:      https://dev.haiku-os.org/ticket/11458

Fix #11458, pt.1: invoking jam from source dir does not work.

* Apply change suggested by Ingo: replace LocalDepends with Depends.

----------------------------------------------------------------------------

diff --git a/build/jam/PackageRules b/build/jam/PackageRules
index 11cf632..db9ab04 100644
--- a/build/jam/PackageRules
+++ b/build/jam/PackageRules
@@ -214,7 +214,7 @@ rule BuildHaikuPackage package : packageInfo
        local mainScript = build_haiku_package ;
        SEARCH on $(mainScript) = [ FDirName $(HAIKU_TOP) build scripts ] ;
 
-       LocalDepends $(package) : $(mainScript) $(scripts) ;
+       Depends $(package) : $(mainScript) $(scripts) ;
        BuildHaikuPackage1 $(package) : $(mainScript) $(packageInfo) $(scripts) 
;
 }
 

############################################################################

Commit:      532b7b60a9d22e452cce01e50f93f703e4c01a9f
URL:         http://cgit.haiku-os.org/haiku/commit/?id=532b7b6
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Sun Nov 16 14:56:14 2014 UTC

Ticket:      https://dev.haiku-os.org/ticket/11458

Fix #11458, pt.2: invoking jam from source dir does not work.

* Adjust package_repo create command to check if each given package
  exists before adding it to the repository writer and fail with
  an appropriate message when it does not.

----------------------------------------------------------------------------

diff --git a/src/bin/package_repo/command_create.cpp 
b/src/bin/package_repo/command_create.cpp
index e47ff76..1d8c1d0 100644
--- a/src/bin/package_repo/command_create.cpp
+++ b/src/bin/package_repo/command_create.cpp
@@ -214,6 +214,10 @@ command_create(int argc, const char* const* argv)
                if (verbose)
                        printf("reading package '%s' ...\n", 
packageFileNames[i]);
                BEntry entry(packageFileNames[i]);
+               if (!entry.Exists()) {
+                       printf("package '%s' does not exist\n", 
packageFileNames[i]);
+                       return 1;
+               }
                result = repositoryWriter.AddPackage(entry);
                if (result != B_OK)
                        return 1;

############################################################################

Revision:    hrev48311
Commit:      8e77a6439a375b7cc239cb0eb5b574c495a4b623
URL:         http://cgit.haiku-os.org/haiku/commit/?id=8e77a64
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Sun Nov 16 14:58:03 2014 UTC

Ticket:      https://dev.haiku-os.org/ticket/11458

Fix #11458, pt.3: invoking jam from source dir does not work.

* Adjust build_haiku_repository script to invoke package_repo without
  -C <dir>, as that is not needed and has the unintended side-effect
  of rendering relative package paths non-functional.

----------------------------------------------------------------------------

diff --git a/build/scripts/build_haiku_repository 
b/build/scripts/build_haiku_repository
index 27a1f8d..00c8fde 100755
--- a/build/scripts/build_haiku_repository
+++ b/build/scripts/build_haiku_repository
@@ -37,8 +37,7 @@ done
 
 # build the repository file
 cp "$repoInfo" "$repositoryDir/repo.info"
-"$packageRepo" create -C "$repositoryDir" "$repositoryDir/repo.info" \
-       "$packageDir"/*.hpkg
+"$packageRepo" create "$repositoryDir/repo.info" "$packageDir"/*.hpkg
 
 # create the checksum file
 $sha256 "$repositoryDir/repo" \
[haiku-commits] haiku: hrev48311 - build/scripts src/bin/package_repo build/jam

Other related posts:
