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

Enforce current package rules for packages built from tree

Browse Source 
* Replace '-' in package name by '_'.
* Use new '[...]' notation for pre-release version component.
This commit is contained in:
Ingo Weinhold
2013-04-18 14:44:44 +02:00
parent defc1f774a
commit 7b2d062147
7 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuPackages
+12 -12
View File
@@ -355,10 +355,10 @@ CopyDirectoryToPackage documentation
BuildHaikuPackage $(haikuPackage) : haiku ;
#pragma mark - haiku-devel.hpkg
#pragma mark - haiku_devel.hpkg
local haikuDevelPackage = haiku-devel.hpkg ;
local haikuDevelPackage = haiku_devel.hpkg ;
HaikuPackage $(haikuDevelPackage) ;
local arch = $(TARGET_ARCH) ;
@@ -435,13 +435,13 @@ if $(HAIKU_GCC_VERSION[1]) = 2 {
: [ FDirName $(HAIKU_TOP) headers cpp ] : 2.95.3 : -x .svn ;
}
BuildHaikuPackage $(haikuDevelPackage) : haiku-devel ;
BuildHaikuPackage $(haikuDevelPackage) : haiku_devel ;
#pragma mark - haiku-userguide.hpkg
#pragma mark - haiku_userguide.hpkg
local haikuUserGuidePackage = haiku-userguide.hpkg ;
local haikuUserGuidePackage = haiku_userguide.hpkg ;
HaikuPackage $(haikuUserGuidePackage) ;
CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs userguide ]
@@ -449,13 +449,13 @@ CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs userguide ]
SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ;
AddFilesToPackage bin : userguide ;
BuildHaikuPackage $(haikuUserGuidePackage) : haiku-userguide ;
BuildHaikuPackage $(haikuUserGuidePackage) : haiku_userguide ;
#pragma mark - haiku-welcome.hpkg
#pragma mark - haiku_welcome.hpkg
local haikuWelcomePackage = haiku-welcome.hpkg ;
local haikuWelcomePackage = haiku_welcome.hpkg ;
HaikuPackage $(haikuWelcomePackage) ;
CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs welcome ]
@@ -463,13 +463,13 @@ CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs welcome ]
SEARCH on welcome = [ FDirName $(HAIKU_TOP) data bin ] ;
AddFilesToPackage bin : welcome ;
BuildHaikuPackage $(haikuWelcomePackage) : haiku-welcome ;
BuildHaikuPackage $(haikuWelcomePackage) : haiku_welcome ;
#pragma mark - makefile-engine.hpkg
#pragma mark - makefile_engine.hpkg
local makefileEnginePackage = makefile-engine.hpkg ;
local makefileEnginePackage = makefile_engine.hpkg ;
HaikuPackage $(makefileEnginePackage) ;
# skeleton makefile and makefile-engine
@@ -480,4 +480,4 @@ local makefileEngineFiles =
SEARCH on $(makefileEngineFiles) = [ FDirName $(HAIKU_TOP) data develop ] ;
AddFilesToPackage develop etc : $(makefileEngineFiles) ;
BuildHaikuPackage $(makefileEnginePackage) : makefile-engine ;
BuildHaikuPackage $(makefileEnginePackage) : makefile_engine ;
build/jam/OptionalPackages
+4 -4
View File
@@ -565,8 +565,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
$(HAIKU_GCC_VERSION[1]) ;
}
AddFilesToHaikuImage system packages : haiku-devel.hpkg ;
AddFilesToHaikuImage common packages : makefile-engine.hpkg ;
AddFilesToHaikuImage system packages : haiku_devel.hpkg ;
AddFilesToHaikuImage common packages : makefile_engine.hpkg ;
}
@@ -1477,8 +1477,8 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
# Welcome
if [ IsOptionalHaikuImagePackageAdded Welcome ] {
AddFilesToHaikuImage system packages : haiku-userguide.hpkg ;
AddFilesToHaikuImage system packages : haiku-welcome.hpkg ;
AddFilesToHaikuImage system packages : haiku_userguide.hpkg ;
AddFilesToHaikuImage system packages : haiku_welcome.hpkg ;
AddSymlinkToHaikuImage home Desktop : /boot/system/bin/welcome
: Welcome ;