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 ; 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) ; HaikuPackage $(haikuDevelPackage) ;
local arch = $(TARGET_ARCH) ; local arch = $(TARGET_ARCH) ;
@@ -435,13 +435,13 @@ if $(HAIKU_GCC_VERSION[1]) = 2 {
: [ FDirName $(HAIKU_TOP) headers cpp ] : 2.95.3 : -x .svn ; : [ 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) ; HaikuPackage $(haikuUserGuidePackage) ;
CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs userguide ] 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 ] ; SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ;
AddFilesToPackage bin : userguide ; 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) ; HaikuPackage $(haikuWelcomePackage) ;
CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs welcome ] 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 ] ; SEARCH on welcome = [ FDirName $(HAIKU_TOP) data bin ] ;
AddFilesToPackage bin : welcome ; 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) ; HaikuPackage $(makefileEnginePackage) ;
# skeleton makefile and makefile-engine # skeleton makefile and makefile-engine
@@ -480,4 +480,4 @@ local makefileEngineFiles =
SEARCH on $(makefileEngineFiles) = [ FDirName $(HAIKU_TOP) data develop ] ; SEARCH on $(makefileEngineFiles) = [ FDirName $(HAIKU_TOP) data develop ] ;
AddFilesToPackage develop etc : $(makefileEngineFiles) ; 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]) ; $(HAIKU_GCC_VERSION[1]) ;
} }
AddFilesToHaikuImage system packages : haiku-devel.hpkg ; AddFilesToHaikuImage system packages : haiku_devel.hpkg ;
AddFilesToHaikuImage common packages : makefile-engine.hpkg ; AddFilesToHaikuImage common packages : makefile_engine.hpkg ;
} }
@@ -1477,8 +1477,8 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
# Welcome # Welcome
if [ IsOptionalHaikuImagePackageAdded Welcome ] { if [ IsOptionalHaikuImagePackageAdded Welcome ] {
AddFilesToHaikuImage system packages : haiku-userguide.hpkg ; AddFilesToHaikuImage system packages : haiku_userguide.hpkg ;
AddFilesToHaikuImage system packages : haiku-welcome.hpkg ; AddFilesToHaikuImage system packages : haiku_welcome.hpkg ;
AddSymlinkToHaikuImage home Desktop : /boot/system/bin/welcome AddSymlinkToHaikuImage home Desktop : /boot/system/bin/welcome
: Welcome ; : Welcome ;
src/data/package_infos/haiku
+2 -2
View File
@@ -1,5 +1,5 @@
name haiku name haiku
version R1-alpha3_pm-1 version R1[alpha3_pm]-1
architecture x86_gcc2 architecture x86_gcc2
summary "The Haiku base system" summary "The Haiku base system"
@@ -16,7 +16,7 @@ licenses {
} }
provides { provides {
haiku=R1-alpha3_pm-1 compat>=R1-alpha1 haiku=R1[alpha3_pm]-1 compat>=R1[alpha1]
coreutils=8.4 compat>=0.0 coreutils=8.4 compat>=0.0
diffutils=2.8.1 compat>=0.0 diffutils=2.8.1 compat>=0.0
findutils=4.2.33 compat>=0.0 findutils=4.2.33 compat>=0.0
src/data/package_infos/haiku-devel → src/data/package_infos/haiku_devel
+4 -4
View File
@@ -1,5 +1,5 @@
name haiku-devel name haiku_devel
version R1-alpha3_pm-1 version R1[alpha3_pm]-1
architecture x86_gcc2 architecture x86_gcc2
summary "The Haiku base system development files" summary "The Haiku base system development files"
@@ -14,9 +14,9 @@ copyrights "2001-2011 Haiku, Inc. et al"
licenses "MIT" licenses "MIT"
provides { provides {
haiku-devel=R1-alpha3_pm-1 haiku_devel=R1[alpha3_pm]-1
} }
requires { requires {
haiku haiku == R1[alpha3_pm]-1
} }
src/data/package_infos/haiku-userguide → src/data/package_infos/haiku_userguide
+3 -3
View File
@@ -1,5 +1,5 @@
name haiku-userguide name haiku_userguide
version R1-alpha3_pm-1 version R1[alpha3_pm]-1
architecture any architecture any
summary "The Haiku user documentation" summary "The Haiku user documentation"
description "The Haiku user documentation." description "The Haiku user documentation."
@@ -11,7 +11,7 @@ copyrights "2001-2011 Haiku, Inc. et al"
licenses MIT licenses MIT
provides { provides {
haiku-userguide=R1-alpha3_pm-1 haiku_userguide=R1[alpha3_pm]-1
} }
requires { requires {
src/data/package_infos/haiku-welcome → src/data/package_infos/haiku_welcome
+3 -3
View File
@@ -1,5 +1,5 @@
name haiku-welcome name haiku_welcome
version R1-alpha3_pm-1 version R1[alpha3_pm]-1
architecture any architecture any
summary "The Haiku welcome documentation" summary "The Haiku welcome documentation"
description "The Haiku welcome documentation for new users." description "The Haiku welcome documentation for new users."
@@ -11,7 +11,7 @@ copyrights "2001-2011 Haiku, Inc. et al"
licenses "MIT" licenses "MIT"
provides { provides {
haiku-welcome=R1-alpha3_pm-1 haiku_welcome=R1[alpha3_pm]-1
} }
requires { requires {
src/data/package_infos/makefile-engine → src/data/package_infos/makefile_engine
+3 -3
View File
@@ -1,5 +1,5 @@
name makefile-engine name makefile_engine
version R1-alpha3_pm-1 version R1[alpha3_pm]-1
architecture any architecture any
summary "The makefile engine" summary "The makefile engine"
description "A simple generic makefile engine and makefile template." description "A simple generic makefile engine and makefile template."
@@ -11,7 +11,7 @@ copyrights "? Be Inc. 2001-2011 Haiku, Inc."
licenses MIT licenses MIT
provides { provides {
makefile-engine=R1-alpha3_pm-1 makefile_engine=R1[alpha3_pm]-1
} }
requires { requires {