diff options
| -rw-r--r-- | odk/pack/copying/makefile.mk | 29 | ||||
| -rw-r--r-- | odk/pack/unzip_udk/makefile.mk | 28 | ||||
| -rw-r--r-- | odk/util/makefile.pmk | 15 |
3 files changed, 47 insertions, 25 deletions
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index 0402221d7a9d..c46707b1142d 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -7,8 +7,7 @@ TARGET=copying .INCLUDE: $(PRJ)$/util$/makefile.pmk #---------------------------------------------------------------- -TITLE="OpenOffice.org 1.0" -PRODUCTNAME="OpenOffice.org" +CONVERTTAGFLAG = $(MISC)$/converttags_html_files.flag IDLDIRLIST={$(subst,/,$/ $(shell $(FIND) $(IDLOUT) -type d -print))} @@ -348,21 +347,14 @@ all : \ $(DESTDIRDLL)$/$(MY_DLLPREFIX)officebean$(MY_DLLPOSTFIX) \ $(DESTDIR)$/settings$/dk.mk \ $(DESTDIRCLASSES)$/officebean.jar \ - converttags + $(CONVERTTAGFLAG) # $(DESTDIRCLASSES)$/unoil.jar \ # $(DESTDIR)$/odk_overview.html \ -.IF "$(BUILD_SOSL)"!="" -converttags : - +$(PERL) $(CONVERTSCRIPT) $(DESTDIREXAMPLES) odk_ examples -.ELSE -converttags : - @echo no conversion necessary!! -.ENDIF #.IF "$(BUILD_SOSL)"!="" #convert_links : -# +$(PERL) $(CONVERTTAGSCRIPT) $(TITLE) $(PRODUCTNAME) $(DOCUHTMLFILES) +# +$(PERL) $(CONVERTSCRIPT) $(DESTDIREXAMPLES) odk_ examples #.ELSE #convert_links : # +echo no conversion necessary!! @@ -433,7 +425,9 @@ $(DESTDIRDLL)$/$(MY_DLLPREFIX)officebean$(MY_DLLPOSTFIX) : $(MY_DLLOUT)$/$(MY_DL $(DESTDIR)$/settings$/dk.mk : $(PRJ)$/util$/dk.mk +-rm -f $@ >& $(NULLDEV) - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/util$/dk.mk $(MY_TEXTCOPY_TARGETPRE) $@ + echo #$(ODKNAME) dependent settings > $@ + echo DKNAME=${ODKNAME} >> $@ + echo DKREGISTRYNAME=applicat.rdb >> $@ .IF "$(BUILD_SOSL)"=="" $(DESTDIR)$/odk_overview.html : $(PRJ)$/util$/odk_overview.html @@ -451,3 +445,14 @@ $(DESTDIRIDL)$/% : $(IDLOUT)$/% remove_dk : +-$(RM) $(DESTDIRBIN)$/udkapi.rdb >& $(NULLDEV) + +.IF "$(BUILD_SOSL)"!="" +$(CONVERTTAGFLAG) : $(MISC)$/deltree.txt + +$(PERL) $(CONVERTTAGSCRIPT) $(PRODUCT_NAME) $(PRODUCT_NAME) $(DOCUHTMLFILES) + touch $@ +.ELSE +$(CONVERTTAGFLAG) : $(MISC)$/deltree.txt + +echo no conversion necessary!! + touch $@ +.ENDIF + diff --git a/odk/pack/unzip_udk/makefile.mk b/odk/pack/unzip_udk/makefile.mk index fff21a4e1d25..af27854ffb80 100644 --- a/odk/pack/unzip_udk/makefile.mk +++ b/odk/pack/unzip_udk/makefile.mk @@ -9,29 +9,53 @@ TARGET=unzip_udk .IF "$(GUI)"=="WNT" UDKPATH=$(UDKZIPPATH)$/$(UDKNAME).zip +ODKDOCPATH=$(UDKZIPPATH)$/$(ODKDOCNAME).zip .ELSE UDKPATH=$(UDKZIPPATH)$/$(UDKNAME).tar.gz +ODKDOCPATH=$(UDKZIPPATH)$/$(ODKDOCNAME).tar.gz .ENDIF + all: ..$/misc$/deltree.txt ..$/misc$/deltree.txt .SETDIR=$(OUT)$/bin : $(UDKPATH) ..$/..$/pack$/unzip_udk$/deltree.txt # first clean everything +-$(RM) ..$/misc$/unzip_udk_succeeded.txt >& $(NULLDEV) +.IF "$(BUILD_SOSL)"=="" +-$(MY_DELETE_RECURSIVE) $(ODKNAME) >& $(NULLDEV) +.ELSE + +-$(MY_DELETE_RECURSIVE) $(PRODUCT_NAME) >& $(NULLDEV) +.ENDIF +-$(MY_DELETE_RECURSIVE) $(UDKNAME) >& $(NULLDEV) +-$(MY_DELETE_RECURSIVE) $(UDKNAME).zip >& $(NULLDEV) +-$(MY_DELETE_RECURSIVE) $(UDKNAME).tar.gz >& $(NULLDEV) +-$(MY_DELETE_RECURSIVE) $(UDKNAME).tar >& $(NULLDEV) + +-$(MY_DELETE_RECURSIVE) $(ODKDOCNAME).zip >& $(NULLDEV) + +-$(MY_DELETE_RECURSIVE) $(ODKDOCNAME).tar.gz >& $(NULLDEV) + +-$(MY_DELETE_RECURSIVE) $(ODKDOCNAME).tar >& $(NULLDEV) +-$(MY_DELETE_RECURSIVE) $(ODKNAME).zip >& $(NULLDEV) +-$(MY_DELETE_RECURSIVE) $(ODKNAME).tar.gz >& $(NULLDEV) +-$(MY_DELETE_RECURSIVE) $(ODKNAME).tar >& $(NULLDEV) $(GNUCOPY) -p $(UDKPATH) . + $(GNUCOPY) -p $(ODKDOCPATH) . .IF "$(GUI)"=="WNT" unzip -q -d . $(UDKNAME) + +-$(RENAME) $(UDKNAME) $(ODKNAME) + unzip -q -d . $(ODKDOCNAME).zip .ELSE gzip -df < $(UDKNAME).tar.gz | tar -xvf - + +-$(RENAME) $(UDKNAME) $(ODKNAME) + gzip -df < $(ODKDOCNAME).tar.gz | tar -xvf - +.ENDIF +.IF "$(BUILD_SOSL)"!="" +# for OpenOffice build rename to PRODUCT_NAME + +-$(RENAME) $(ODKNAME) $(PRODUCT_NAME) .ENDIF - +-$(RENAME) $(UDKNAME) $(ODKNAME) - +rm -f $(ODKNAME)$/settings$/dk.mk + +-$(MY_DELETE_RECURSIVE) $(UDKNAME).zip >& $(NULLDEV) + +-$(MY_DELETE_RECURSIVE) $(UDKNAME).tar.gz >& $(NULLDEV) + +-$(MY_DELETE_RECURSIVE) $(UDKNAME).tar >& $(NULLDEV) + +-$(MY_DELETE_RECURSIVE) $(ODKDOCNAME).zip >& $(NULLDEV) + +-$(MY_DELETE_RECURSIVE) $(ODKDOCNAME).tar.gz >& $(NULLDEV) + +-$(MY_DELETE_RECURSIVE) $(ODKDOCNAME).tar >& $(NULLDEV) + +$(MY_DELETE_RECURSIVE) $(ODKNAME)$/settings$/dk.mk touch ..$/misc$/deltree.txt diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 623b4943a54c..49be17b43f9f 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -1,18 +1,11 @@ #ODKNAME=odk$(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) -.IF "$(ODK_RELEASE)"=="" +ODK_RELEASE=1.0 -.IF "$(BUILD_SOSL)"=="" -# for SUN build without minor -ODKNAME=odk$(UPD) -.ELSE -# for OpenOffice build with minor -ODKNAME=odk$(UPD)$(LAST_MINOR) -.ENDIF +PRODUCT_NAME=OpenOffice.org$(ODK_RELEASE) -.ELSE -ODKNAME=odk$(ODK_RELEASE) -.ENDIF +ODKNAME=odk$(UPD)$(LAST_MINOR) +ODKDOCNAME=$(ODKNAME)_doc DESTDIR=$(OUT)$/bin$/$(ODKNAME) DESTDIRIDL=$(DESTDIR)$/idl |