strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#99053# restructure (new targets, new dependencies)

Browse source
This commit is contained in:
Juergen Schmidt 2002-05-31 14:42:19 +00:00
parent fac3fac989
commit 9f3e970465
2 changed files with 41 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
odk/util/makefile.mk
View file

@ -7,31 +7,34 @@ TARGET=odk
.INCLUDE: makefile.pmk
# ------------------------------------------------------------------
all: zipit
.IF "$(BUILD_SOSL)"==""
# for SUN build without minor
zipit .SETDIR=$(DESTDIR)$/.. .PHONY:
.IF "$(OS)"=="WNT"
+zip -ur $(ODKNAME).zip $(ODKNAME)
.ELIF "$(GUI)"=="UNX"
# tar does not properly support update
+tar cf - $(ODKNAME) | gzip - > $(ODKNAME).tar.gz
.ENDIF
# for SUN build
ZIPFILE=$(ODKZIPFILE)
TARGZFILE=$(ODKTARGZFILE)
ZIPDIR=$(ODKNAME)
.ELSE
# for OpenOffice build with minor
zipit .SETDIR=$(DESTDIR)$/.. .PHONY:
.IF "$(OS)"=="WNT"
+zip -ur $(PRODUCT_NAME).zip $(PRODUCT_NAME)
.ELIF "$(GUI)"=="UNX"
# tar does not properly support update
+tar cf - $(PRODUCT_NAME) | gzip - > $(PRODUCT_NAME).tar.gz
.ENDIF
# for OO build
ZIPFILE=$(PRODUCTZIPFILE)
TARGZFILE=$(PRODUCTTARGZFILE)
ZIPDIR=$(PRODUCT_NAME)
.ENDIF
.IF "$(OS)"=="WNT"
all:\
$(BIN)$/$(ZIPFILE)
.ELSE
all:\
$(BIN)$/$(TARGZFILE)
.ENDIF
$(BIN)$/$(ZIPFILE) .SETDIR=$(DESTDIR)$/.. .PHONY:
+zip -ur $(ZIPFILE) $(ZIPDIR)
$(BIN)$/$(TARGZFILE) .SETDIR=$(DESTDIR)$/.. .PHONY:
# tar does not properly support update
+tar cf - $(ZIPDIR) | gzip - > $(TARGZFILE)

24
odk/util/makefile.pmk
View file

@ -4,18 +4,25 @@ ODK_RELEASE=1.0
PRODUCT_NAME=OpenOffice.org$(ODK_RELEASE)
.IF "$(BUILD_SOSL)"==""
# for SUN build without minor
PRODUCTZIPFILE=$(PRODUCT_NAME).zip
PRODUCTTARGZFILE=$(PRODUCT_NAME).tar.gz
ODKNAME=odk$(UPD)
ODKDOCNAME=$(ODKNAME)_doc
ODKZIPFILE=$(ODKNAME).zip
ODKTARGZFILE=$(ODKNAME).tar.gz
.IF "$(BUILD_SOSL)"==""
# for Sun build use ODKNAME as directory name
DESTDIR=$(OUT)$/bin$/$(ODKNAME)
.ELSE
# for OpenOffice build with minor
ODKNAME=odk$(UPD)$(LAST_MINOR)
ODKDOCNAME=$(ODKNAME)_doc
# for OpenOffice build use PRODUCT_NAME as directory name
DESTDIR=$(OUT)$/bin$/$(PRODUCT_NAME)
.ENDIF
DESTDIR=$(OUT)$/bin$/$(ODKNAME)
DESTDIRIDL=$(DESTDIR)$/idl
DESTDIRSETTINGS=$(DESTDIR)$/settings
DESTDIREXAMPLES=$(DESTDIR)$/examples
@ -30,6 +37,7 @@ DESTDIRDOCUIMAGES=$(DESTDIRDOCU)$/images
UDKZIPPATH=$(SOLARBINDIR)
UDKNAME=udk$(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO)
UDKZIPPREFIX=$(UDKNAME)_odk
CHECKSCRIPT=$(SOLARENV)$/bin$/checkit.pl
BINOUT=$(SOLARBINDIR)
@ -45,6 +53,7 @@ CONVERTSCRIPT=$(SOLARENV)$/bin$/convertlinks.pl
#--------------------
# WNT ONLY
#--------------------
DOLLARSIGN=$$
MY_DELETE_RECURSIVE=del /sxyf
MY_DIRCMP=dircmp -r
MY_TEXTCOPY=cat
@ -62,6 +71,7 @@ DESTDIRDLL=$(DESTDIRBIN)
#--------------------
# UNX ONLY
#--------------------
DOLLARSIGN=\$$
MY_DELETE_RECURSIVE=rm -rf
MY_DIRCMP=dircmp
MY_TEXTCOPY= tr -d "\015"