[haiku-commits] haiku: hrev44727 - in build: jam scripts
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 30 Oct 2012 22:37:55 +0100 (CET)
hrev44727 adds 1 changeset to branch 'master'
old head: 0d6a077db2e6a122188844a148ae474b74723b69
new head: 4107ac9cda4e76ce515596afebc11005b6e97534
----------------------------------------------------------------------------
4107ac9: Cleanup of remains of subversion in the build system
[ JÃrÃme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44727
Commit: 4107ac9cda4e76ce515596afebc11005b6e97534
URL: http://cgit.haiku-os.org/haiku/commit/?id=4107ac9
Author: JÃrÃme Duval <jerome.duval@xxxxxxxxx>
Date: Tue Oct 30 21:29:10 2012 UTC
----------------------------------------------------------------------------
5 files changed, 16 insertions(+), 16 deletions(-)
build/jam/HaikuImage | 16 ++++++++--------
build/jam/ImageRules | 4 ++--
build/jam/OptionalPackages | 8 ++++----
build/scripts/build_cross_tools | 2 +-
build/scripts/build_cross_tools_gcc4 | 2 +-
----------------------------------------------------------------------------
diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index b1e9f0e..2734ce0 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -737,42 +737,42 @@ AddDirectoryToHaikuImage home config settings printers
"Save as PDF"
# PDF Writer enconding files
CopyDirectoryToHaikuImage system data
: [ FDirName $(HAIKU_TOP) src add-ons print drivers pdf encoding ]
- : "PDF Writer" : -x .svn -x Jamfile ;
+ : "PDF Writer" : -x Jamfile ;
# Gutenprint data files
CopyDirectoryToHaikuImage system data
: [ FDirName $(HAIKU_TOP) src libs print libgutenprint src xml ]
- : gutenprint : -x .svn -x *.c -x Makefile.am -x Makefile.in ;
+ : gutenprint : -x *.c -x Makefile.am -x Makefile.in ;
# dvb channel settings
CopyDirectoryToHaikuImage home config settings Media
: [ FDirName $(HAIKU_TOP) data settings media dvb ]
- : dvb : -x .svn -x Jamfile ;
+ : dvb : -x Jamfile ;
# licenses
CopyDirectoryToHaikuImage system data
: [ FDirName $(HAIKU_TOP) data system data licenses ]
- : licenses : -x .svn ;
+ : licenses ;
# Copy documentation as per DiskUsage's license requirement.
CopyDirectoryToHaikuImage system documentation
: [ FDirName $(HAIKU_TOP) docs apps diskusage ]
- : diskusage : -x .svn ;
+ : diskusage ;
# Copy documentation as per PDFlib Lite's license requirement.
CopyDirectoryToHaikuImage system documentation
: [ FDirName $(HAIKU_TOP) src libs pdflib doc ]
- : pdflib : -x .svn ;
+ : pdflib ;
# Copy sample programs as per PDFlib Lite's license requirement.
CopyDirectoryToHaikuImage develop sample-code
: [ FDirName $(HAIKU_TOP) src libs pdflib bind pdflib ]
- : pdflib : -x .svn ;
+ : pdflib ;
# Copy Mesa3D GL headers into image
if $(TARGET_ARCH) = x86 {
CopyDirectoryToHaikuImage develop headers os opengl
- : [ FDirName $(HAIKU_MESA_HEADERS) GL ] : : -x .svn ;
+ : [ FDirName $(HAIKU_MESA_HEADERS) GL ] ;
}
#pragma mark - Optional Packages
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index c227540..34f90ae 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -705,7 +705,7 @@ rule AddSourceDirectoryToHaikuImage dirTokens : alwaysUpdate
CopyDirectoryToHaikuImage home HaikuSources
: [ FDirName $(HAIKU_TOP) $(dirTokens) ]
- : : -x .svn : $(alwaysUpdate) ;
+ : : : $(alwaysUpdate) ;
}
rule AddHeaderDirectoryToHaikuImage dirTokens : dirName : alwaysUpdate
@@ -715,7 +715,7 @@ rule AddHeaderDirectoryToHaikuImage dirTokens : dirName :
alwaysUpdate
CopyDirectoryToHaikuImage develop headers
: [ FDirName $(HAIKU_TOP) headers $(dirTokens) ]
- : $(dirName) : -x .svn : $(alwaysUpdate) ;
+ : $(dirName) : : $(alwaysUpdate) ;
}
rule AddWifiFirmwareToHaikuImage driver : package : archive : extract
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index a1c1373..5c731e2 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -861,9 +861,9 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] &&
$(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) = 2 {
# GCC 2 only -- for GCC 4 they come with the DevelopmentBase
package
CopyDirectoryToHaikuImage $(abiDirTokens) headers
- : [ FDirName $(HAIKU_TOP) headers cpp ] : : -x .svn ;
+ : [ FDirName $(HAIKU_TOP) headers cpp ] ;
CopyDirectoryToAlternativeGCCArchive $(abiDirTokens) headers
- : [ FDirName $(HAIKU_TOP) headers cpp ] : : -x .svn ;
+ : [ FDirName $(HAIKU_TOP) headers cpp ] ;
}
}
@@ -1980,10 +1980,10 @@ if [ IsOptionalHaikuImagePackageAdded
WebPositiveBookmarks ] {
if [ IsOptionalHaikuImagePackageAdded Welcome ] {
CopyDirectoryToHaikuImage system documentation
: [ FDirName $(HAIKU_TOP) docs welcome ]
- : welcome : -x .svn ;
+ : welcome ;
CopyDirectoryToHaikuImage system documentation
: [ FDirName $(HAIKU_TOP) docs userguide ]
- : userguide : -x .svn ;
+ : userguide ;
}
diff --git a/build/scripts/build_cross_tools b/build/scripts/build_cross_tools
index ea442b5..3738262 100755
--- a/build/scripts/build_cross_tools
+++ b/build/scripts/build_cross_tools
@@ -109,7 +109,7 @@ copy_headers()
sourceDir=$1
targetDir=$2
- headers="`find $sourceDir -name \*\.h | grep -v /.svn`"
+ headers="`find $sourceDir -name \*\.h`"
headers="`echo $headers | sed -e s@$sourceDir/@@g`"
for f in $headers; do
headerTargetDir=$targetDir/`dirname $f`
diff --git a/build/scripts/build_cross_tools_gcc4
b/build/scripts/build_cross_tools_gcc4
index d8960f3..976ff9d 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -130,7 +130,7 @@ copy_headers()
sourceDir=$1
targetDir=$2
- headers="$(find $sourceDir -name \*\.h | grep -v /.svn)"
+ headers="$(find $sourceDir -name \*\.h)"
headers="$(echo $headers | sed -e s@$sourceDir/@@g)"
for f in $headers; do
headerTargetDir=$targetDir/$(dirname $f)
Other related posts:
- » [haiku-commits] haiku: hrev44727 - in build: jam scripts - korli
