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

* Added jam 2.5 rc3 MakeLocate rule.

Browse Source 
* Fixed the Package* rules.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5740 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2003-12-23 17:23:18 +00:00
parent 20d32b2c37
commit c06f365f26
1 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+50 -25
View File
@@ -214,6 +214,9 @@ OBOS_STLIB_DIR ?= [ FDirName $(OBOS_DISTRO_TARGET) develop lib
$(OBOS_ARCH) ] ; $(OBOS_ARCH) ] ;
OBOS_TEST_DIR ?= [ FDirName $(OBOS_TOP) tests ] ; OBOS_TEST_DIR ?= [ FDirName $(OBOS_TOP) tests ] ;
OBOS_PACKAGE_DIR ?= [ FDirName $(OBOS_TOP) packages $(OBOS_TARGET) ] ;
OBOS_PACKAGE_OBJECT_DIR ?= [ FDirName $(OBOS_OBJECT_TARGET) packages ] ;
OBOS_KERNEL_CONFIG = config.$(OBOS_ARCH).ini ; OBOS_KERNEL_CONFIG = config.$(OBOS_ARCH).ini ;
OBOS_KERNEL = kernel.$(OBOS_ARCH) ; OBOS_KERNEL = kernel.$(OBOS_ARCH) ;
OBOS_FLOPPY = floppy.$(OBOS_ARCH) ; OBOS_FLOPPY = floppy.$(OBOS_ARCH) ;
@@ -257,6 +260,17 @@ rule SetupDefaultIncludes
# Things Jam needs in order to work :) # Things Jam needs in order to work :)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# TODO: back-ported from jam 2.5: remove when not longer needed
rule MakeLocate
{
if $(>)
{
LOCATE on $(<) = $(>) ;
Depends $(<) : $(>[1]:G=dir) ;
MkDir $(>[1]:G=dir) ;
}
}
rule Object rule Object
{ {
# This is basically the original Jambase 2.4 Object rule stripped by # This is basically the original Jambase 2.4 Object rule stripped by
@@ -2029,75 +2043,86 @@ rule Packages
} }
} }
OBOS_PACKAGE_DIR ?= [ FDirName $(OBOS_TOP) packages $(OBOS_TARGET) ] ;
OBOS_PACKAGE_OBJECT_DIR ?= [ FDirName $(OBOS_OBJECT_TARGET) packages ] ;
rule Package rule Package
{ {
local packagename = $(1) ; local packagename = $(1) ;
local packagefiles = $(2) ; local packagefiles = $(2) ;
local path = $(3) ; local path = $(3) ;
NotFile $(packagename) ; local packagezip = $(packagename:S=.zip:G=_packages) ;
Depends packages : $(packagename) ;
local packagezip = $(packagename).zip ;
MakeLocate $(packagezip) : $(OBOS_PACKAGE_DIR) ;
local packagedir = [ FDirName $(OBOS_PACKAGE_DIR) $(packagename) ] ; local packagedir = [ FDirName $(OBOS_PACKAGE_DIR) $(packagename) ] ;
local installscript = install.sh ; local installscript = install.sh ;
local packageinstallscript = $(installscript:G=$(packagedir)) ; local packageinstallscript = $(installscript:G=_packages!$(packagename)) ;
MakeLocate $(packageinstallscript) : $(packagedir) ;
local installzip = install.zip ; local installzip = install.zip ;
local packageinstallzip = $(installzip:G=$(packagedir)) ; local packageinstallzip = $(installzip:G=_packages!$(packagename)) ;
MakeLocate $(packageinstallzip) : $(packagedir) ;
local packageobjectdir = [ FDirName $(OBOS_PACKAGE_OBJECT_DIR) $(packagename) ] ; local packageobjectdir
= [ FDirName $(OBOS_PACKAGE_OBJECT_DIR) $(packagename) ] ;
local packagefiledir = [ FDirName $(packageobjectdir) $(path) ] ; local packagefiledir = [ FDirName $(packageobjectdir) $(path) ] ;
local packagefileinstallzip = $(installzip:G=$(packageobjectdir)) ; local packagefileinstallzip
MakeLocate $(packagefileinstallzip) : $(packageobjectdir) ; = $(installzip:G=_package_objects!$(packagename)) ;
# add the files to the install.zip
local packagefilegrist = [ FGrist _package_files $(packagename) $(path) ] ;
for file in $(packagefiles) { for file in $(packagefiles) {
if $(3[0]) = "boot" { if $(3[0]) = "boot" {
local packagefile = $(file:G=$(packagefiledir)) ; local packagefile = $(file:G=$(packagefilegrist)) ;
MakeLocate $(packagefile) : $(packagefiledir) ; MakeLocate $(packagefile) : $(packagefiledir) ;
Copy $(packagefile) : $(file) ; Copy $(packagefile) : $(file) ;
Clean cleanPackages : $(packagefile) ; Clean cleanPackages : $(packagefile) ;
PackageInstallZip $(packagefileinstallzip) : $(packagefile) ; PackageInstallZip $(packagefileinstallzip) : $(packagefile) ;
} else { } else {
local packagefile = $(file:G=$(packagedir)) ; local packagefile = $(file:G=_packages!$(packagename)) ;
MakeLocate $(packagefile) : $(packagedir) ; MakeLocate $(packagefile) : $(packagedir) ;
Copy $(packagefile) : $(file) ; Copy $(packagefile) : $(file) ;
Clean cleanPackages : $(packagefile) ; Clean cleanPackages : $(packagefile) ;
Depends $(packagezip) : $(packagefile) ; Depends $(packagezip) : $(packagefile) ;
} }
} }
# general setup for this packages -- only on first invocation
if ! $(_setup_$(packagename)) {
_setup_$(packagename) = true ;
NotFile $(packagename) ;
Depends packages : $(packagename) ;
MakeLocate $(packagezip) : $(OBOS_PACKAGE_DIR) ;
MakeLocate $(packageinstallscript) : $(packagedir) ;
MakeLocate $(packageinstallzip) : $(packagedir) ;
MakeLocate $(packagefileinstallzip) : $(packageobjectdir) ;
PackageInstallScript $(packageinstallscript) : $(packagedir) ; PackageInstallScript $(packageinstallscript) : $(packagedir) ;
LinkInstallZip $(packageinstallzip) : $(packagefileinstallzip) ; LinkInstallZip $(packageinstallzip) : $(packagefileinstallzip) ;
Depends $(packagename) : $(packagezip) ; Depends $(packagename) : $(packagezip) ;
PackageZip $(packagezip) : PackageZip $(packagezip) : $(packagedir)
$(packagedir) $(packageinstallscript) $(packageinstallzip) ; : $(packageinstallscript) $(packageinstallzip) ;
}
} }
rule PackageZip rule PackageZip
{ {
Depends $(1) : $(2) ; local dir = $(2:G=dir) ;
Depends $(1) : $(dir) $(3) ;
Clean cleanPackages : $(1) ; Clean cleanPackages : $(1) ;
PackageZip1 $(1) : $(dir) ;
} }
actions together PackageZip { actions together PackageZip1 {
cd $(OBOS_PACKAGE_DIR) ; cd $(OBOS_PACKAGE_DIR) ;
zip -rq $(1:BS) $(2[1]:BS) ; zip -rq $(1:BS) $(2:BS) ;
} }
rule PackageInstallScript rule PackageInstallScript
{ {
MakeLocate $(1) : $(2) ; MakeLocate $(1) : $(2) ;
Clean cleanPackages : $(1) ; Clean cleanPackages : $(1) ;
PackageInstallScript1 $(1) : $(2:G=dir) ;
} }
actions together PackageInstallScript actions together PackageInstallScript1
{ {
echo '#!/bin/sh echo '#!/bin/sh
base=`dirname "$0"` base=`dirname "$0"`