i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup of remains of subversion in the build system

Browse Source
This commit is contained in:
Jérôme Duval
2012-10-30 22:36:32 +01:00
parent 0d6a077db2
commit 4107ac9cda
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+8 -8
View File
@@ -737,42 +737,42 @@ AddDirectoryToHaikuImage home config settings printers "Save as PDF"
# PDF Writer enconding files # PDF Writer enconding files
CopyDirectoryToHaikuImage system data CopyDirectoryToHaikuImage system data
: [ FDirName $(HAIKU_TOP) src add-ons print drivers pdf encoding ] : [ FDirName $(HAIKU_TOP) src add-ons print drivers pdf encoding ]
: "PDF Writer" : -x .svn -x Jamfile ; : "PDF Writer" : -x Jamfile ;
# Gutenprint data files # Gutenprint data files
CopyDirectoryToHaikuImage system data CopyDirectoryToHaikuImage system data
: [ FDirName $(HAIKU_TOP) src libs print libgutenprint src xml ] : [ 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 # dvb channel settings
CopyDirectoryToHaikuImage home config settings Media CopyDirectoryToHaikuImage home config settings Media
: [ FDirName $(HAIKU_TOP) data settings media dvb ] : [ FDirName $(HAIKU_TOP) data settings media dvb ]
: dvb : -x .svn -x Jamfile ; : dvb : -x Jamfile ;
# licenses # licenses
CopyDirectoryToHaikuImage system data CopyDirectoryToHaikuImage system data
: [ FDirName $(HAIKU_TOP) data system data licenses ] : [ FDirName $(HAIKU_TOP) data system data licenses ]
: licenses : -x .svn ; : licenses ;
# Copy documentation as per DiskUsage's license requirement. # Copy documentation as per DiskUsage's license requirement.
CopyDirectoryToHaikuImage system documentation CopyDirectoryToHaikuImage system documentation
: [ FDirName $(HAIKU_TOP) docs apps diskusage ] : [ FDirName $(HAIKU_TOP) docs apps diskusage ]
: diskusage : -x .svn ; : diskusage ;
# Copy documentation as per PDFlib Lite's license requirement. # Copy documentation as per PDFlib Lite's license requirement.
CopyDirectoryToHaikuImage system documentation CopyDirectoryToHaikuImage system documentation
: [ FDirName $(HAIKU_TOP) src libs pdflib doc ] : [ FDirName $(HAIKU_TOP) src libs pdflib doc ]
: pdflib : -x .svn ; : pdflib ;
# Copy sample programs as per PDFlib Lite's license requirement. # Copy sample programs as per PDFlib Lite's license requirement.
CopyDirectoryToHaikuImage develop sample-code CopyDirectoryToHaikuImage develop sample-code
: [ FDirName $(HAIKU_TOP) src libs pdflib bind pdflib ] : [ FDirName $(HAIKU_TOP) src libs pdflib bind pdflib ]
: pdflib : -x .svn ; : pdflib ;
# Copy Mesa3D GL headers into image # Copy Mesa3D GL headers into image
if $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = x86 {
CopyDirectoryToHaikuImage develop headers os opengl CopyDirectoryToHaikuImage develop headers os opengl
: [ FDirName $(HAIKU_MESA_HEADERS) GL ] : : -x .svn ; : [ FDirName $(HAIKU_MESA_HEADERS) GL ] ;
} }
#pragma mark - Optional Packages #pragma mark - Optional Packages
build/jam/ImageRules
+2 -2
View File
@@ -705,7 +705,7 @@ rule AddSourceDirectoryToHaikuImage dirTokens : alwaysUpdate
CopyDirectoryToHaikuImage home HaikuSources CopyDirectoryToHaikuImage home HaikuSources
: [ FDirName $(HAIKU_TOP) $(dirTokens) ] : [ FDirName $(HAIKU_TOP) $(dirTokens) ]
: : -x .svn : $(alwaysUpdate) ; : : : $(alwaysUpdate) ;
} }
rule AddHeaderDirectoryToHaikuImage dirTokens : dirName : alwaysUpdate rule AddHeaderDirectoryToHaikuImage dirTokens : dirName : alwaysUpdate
@@ -715,7 +715,7 @@ rule AddHeaderDirectoryToHaikuImage dirTokens : dirName : alwaysUpdate
CopyDirectoryToHaikuImage develop headers CopyDirectoryToHaikuImage develop headers
: [ FDirName $(HAIKU_TOP) headers $(dirTokens) ] : [ FDirName $(HAIKU_TOP) headers $(dirTokens) ]
: $(dirName) : -x .svn : $(alwaysUpdate) ; : $(dirName) : : $(alwaysUpdate) ;
} }
rule AddWifiFirmwareToHaikuImage driver : package : archive : extract rule AddWifiFirmwareToHaikuImage driver : package : archive : extract
build/jam/OptionalPackages
+4 -4
View File
@@ -861,9 +861,9 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) = 2 { if $(HAIKU_GCC_VERSION[1]) = 2 {
# GCC 2 only -- for GCC 4 they come with the DevelopmentBase package # GCC 2 only -- for GCC 4 they come with the DevelopmentBase package
CopyDirectoryToHaikuImage $(abiDirTokens) headers CopyDirectoryToHaikuImage $(abiDirTokens) headers
: [ FDirName $(HAIKU_TOP) headers cpp ] : : -x .svn ; : [ FDirName $(HAIKU_TOP) headers cpp ] ;
CopyDirectoryToAlternativeGCCArchive $(abiDirTokens) headers 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 ] { if [ IsOptionalHaikuImagePackageAdded Welcome ] {
CopyDirectoryToHaikuImage system documentation CopyDirectoryToHaikuImage system documentation
: [ FDirName $(HAIKU_TOP) docs welcome ] : [ FDirName $(HAIKU_TOP) docs welcome ]
: welcome : -x .svn ; : welcome ;
CopyDirectoryToHaikuImage system documentation CopyDirectoryToHaikuImage system documentation
: [ FDirName $(HAIKU_TOP) docs userguide ] : [ FDirName $(HAIKU_TOP) docs userguide ]
: userguide : -x .svn ; : userguide ;
} }
build/scripts/build_cross_tools
+1 -1
View File
@@ -109,7 +109,7 @@ copy_headers()
sourceDir=$1 sourceDir=$1
targetDir=$2 targetDir=$2
headers="`find $sourceDir -name \*\.h | grep -v /.svn`" headers="`find $sourceDir -name \*\.h`"
headers="`echo $headers | sed -e s@$sourceDir/@@g`" headers="`echo $headers | sed -e s@$sourceDir/@@g`"
for f in $headers; do for f in $headers; do
headerTargetDir=$targetDir/`dirname $f` headerTargetDir=$targetDir/`dirname $f`
build/scripts/build_cross_tools_gcc4
+1 -1
View File
@@ -130,7 +130,7 @@ copy_headers()
sourceDir=$1 sourceDir=$1
targetDir=$2 targetDir=$2
headers="$(find $sourceDir -name \*\.h | grep -v /.svn)" headers="$(find $sourceDir -name \*\.h)"
headers="$(echo $headers | sed -e s@$sourceDir/@@g)" headers="$(echo $headers | sed -e s@$sourceDir/@@g)"
for f in $headers; do for f in $headers; do
headerTargetDir=$targetDir/$(dirname $f) headerTargetDir=$targetDir/$(dirname $f)