[haiku-commits] haiku: hrev51643 - build/jam/repositories/HaikuPorts src/tools build/jam

  • From: waddlesplash@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 2 Dec 2017 04:30:42 +0100 (CET)

hrev51643 adds 2 changesets to branch 'master'
old head: 08ff3a4eea86bfe1436aab9cfedacd7f8c07518b
new head: b4b55835367718ea2babe0f8f27464e81839df4b
overview: 
http://cgit.haiku-os.org/haiku/log/?qt=range&q=b4b558353677+%5E08ff3a4eea86

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

97599bfc05d0: build: Fix release build profile.

b4b558353677: hardlink_packages: Clarify packages directories in helptext.

                              [ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]

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

4 files changed, 10 insertions(+), 4 deletions(-)
build/jam/DefaultBuildProfiles             | 2 +-
build/jam/repositories/HaikuPorts/x86_64   | 2 ++
build/jam/repositories/HaikuPorts/x86_gcc2 | 8 ++++++--
src/tools/hardlink_packages.py             | 2 +-

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

Commit:      97599bfc05d0fd1a76fcb6dac5496fa04f8e2e06
URL:         http://cgit.haiku-os.org/haiku/commit/?id=97599bfc05d0
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Fri Dec  1 21:28:43 2017 UTC

build: Fix release build profile.

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

diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 358abc5..ffa7453 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -87,7 +87,7 @@ rule DefineDefaultBuildProfiles
                                pdfwriter
                                pe
                                python
-                               subversion
+#                              subversion
                                timgmsoundfont
                                vision
                                wpa_supplicant
diff --git a/build/jam/repositories/HaikuPorts/x86_64 
b/build/jam/repositories/HaikuPorts/x86_64
index 71fd1a5..b686e18 100644
--- a/build/jam/repositories/HaikuPorts/x86_64
+++ b/build/jam/repositories/HaikuPorts/x86_64
@@ -136,6 +136,7 @@ RemotePackageRepository HaikuPorts
        openssl_devel-1.0.2m-2
        p7zip-9.20.1-7
        patch-2.7.5-2
+       pdflib-5.0.3-3
        pdfwriter-1.0-3
        pe-2.4.5-7
        perl-5.26.1-1
@@ -252,6 +253,7 @@ RemotePackageRepository HaikuPorts
        openssl
        p7zip
        patch
+       pdflib
        pdfwriter
        pe
        perl
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2 
b/build/jam/repositories/HaikuPorts/x86_gcc2
index a50d65d..90acd4e 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -78,6 +78,7 @@ RemotePackageRepository HaikuPorts
        libiconv-1.13.1-9
        libicns-0.8.1-6
        libicns_devel-0.8.1-6
+       liblayout-1.4.1-3
        libmodplug-0.8.9.0-1
        libogg-1.3.3-1
        libogg_devel-1.3.3-1
@@ -119,6 +120,7 @@ RemotePackageRepository HaikuPorts
        openssl_devel-1.0.2m-2
        p7zip-9.20.1-7
        patch-2.7.5-2
+       pdflib-5.0.3-3
        pdfwriter-1.0-3
        pe-2.4.5-7
        perl-5.18.2-3
@@ -180,8 +182,8 @@ RemotePackageRepository HaikuPorts
        glu_x86_devel-9.0.0-7
        gmp_x86-6.1.2-2
        gnutls36_x86-3.6.1-1
-       haikuwebkit_x86-1.6.2-3
-       haikuwebkit_x86_devel-1.6.2-3
+       haikuwebkit_x86-1.6.3-1
+       haikuwebkit_x86_devel-1.6.3-1
        icu_x86-57.1-2
        icu_x86_devel-57.1-2
        jasper1_x86-1.900.5-1
@@ -304,6 +306,7 @@ RemotePackageRepository HaikuPorts
        libgpg_error
        libiconv
        libicns
+       libmodplug
        libogg
        libogg_x86
        libpcap
@@ -347,6 +350,7 @@ RemotePackageRepository HaikuPorts
        openssl
        p7zip
        patch
+       pdflib
        pdfwriter
        pe
        perl

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

Revision:    hrev51643
Commit:      b4b55835367718ea2babe0f8f27464e81839df4b
URL:         http://cgit.haiku-os.org/haiku/commit/?id=b4b558353677
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Fri Dec  1 21:29:56 2017 UTC

hardlink_packages: Clarify packages directories in helptext.

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

diff --git a/src/tools/hardlink_packages.py b/src/tools/hardlink_packages.py
index 0ca9108..4071548 100755
--- a/src/tools/hardlink_packages.py
+++ b/src/tools/hardlink_packages.py
@@ -11,7 +11,7 @@ import sys, os, re, hashlib
 
 if len(sys.argv) < 5:
        print("usage: hardlink_packages.py [arch] [jam RemotePackageRepository 
file] "
-               + "[source directory] [target directory]")
+               + "[prebuilt packages directory] [destination root directory]")
        print("note that the [jam RemotePackageRepository file] will be 
modified.")
        print("note that [target directory] is assumed to have a 'packages' 
subdirectory, "
                + " and a repo.info.template file (using $ARCH$)")


Other related posts:

  • » [haiku-commits] haiku: hrev51643 - build/jam/repositories/HaikuPorts src/tools build/jam - waddlesplash