From 613221bde1744265c336c2b5f2ade0bfb9b22d16 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 21 Feb 2013 00:56:13 -0600 Subject: convert odk to gbuild and add to tail_build Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0 Reviewed-on: https://gerrit.libreoffice.org/2288 Reviewed-by: Peter Foley Tested-by: Peter Foley --- odk/util/delzip | 1 - odk/util/makefile.mk | 75 -------------------- odk/util/makefile.pmk | 186 ------------------------------------------------- odk/util/odk_rules.pmk | 168 -------------------------------------------- 4 files changed, 430 deletions(-) delete mode 100644 odk/util/delzip delete mode 100644 odk/util/makefile.mk delete mode 100644 odk/util/makefile.pmk delete mode 100644 odk/util/odk_rules.pmk (limited to 'odk/util') diff --git a/odk/util/delzip b/odk/util/delzip deleted file mode 100644 index 8b137891791f..000000000000 --- a/odk/util/delzip +++ /dev/null @@ -1 +0,0 @@ - diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk deleted file mode 100644 index f868ca04345d..000000000000 --- a/odk/util/makefile.mk +++ /dev/null @@ -1,75 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. -PRJNAME=odk -TARGET=odk - -# ------------------------------------------------------------------ -.INCLUDE: settings.mk -.INCLUDE: makefile.pmk -# ------------------------------------------------------------------ -.IF "$(L10N_framework)"=="" - -ZIP1TARGET=odkexamples -ZIP1FLAGS=-u -r -ZIP1DIR=$(PRJ) -ZIP1LIST=examples -x "*.svn*" -x "*CVS*" -x "*makefile.mk" -x "*Inspector*" -x "*Container1*" -x "*Storage*" -x "*register_component*" -x "*examples.html" -x "*ConverterServlet*" -x "*NotesAccess*" -x "*delphi*" - -.ENDIF - -.INCLUDE : target.mk -.IF "$(L10N_framework)"=="" -ALLTAR:\ - $(BIN)$/$(PRODUCTZIPFILE) -# $(BIN)$/odk_oo.zip -.ENDIF - -$(BIN)$/$(PRODUCTZIPFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDK_CHECK_FLAGS) - cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/$(PRODUCTZIPFILE) . $(CHECKZIPRESULT) -# cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/$(PRODUCTZIPFILE) . -x "idl/*" $(CHECKZIPRESULT) -# cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/odkidl.zip idl/* $(CHECKZIPRESULT) - -ODK_OO_FILES=\ - $(PRJ)$/index.html \ - $(PRJ)$/docs$/tools.html \ - $(PRJ)$/docs$/notsupported.html \ - $(PRJ)$/docs$/install.html \ - $(PRJ)$/docs$/sdk_styles.css \ - $(PRJ)$/docs$/images$/arrow-1.gif \ - $(PRJ)$/docs$/images$/arrow-3.gif \ - $(PRJ)$/docs$/images$/bg_table.gif \ - $(PRJ)$/docs$/images$/bg_table2.gif \ - $(PRJ)$/docs$/images$/bg_table3.gif \ - $(PRJ)$/docs$/images$/nav_down.png \ - $(PRJ)$/docs$/images$/nav_home.png \ - $(PRJ)$/docs$/images$/nav_left.png \ - $(PRJ)$/docs$/images$/nav_right.png \ - $(PRJ)$/docs$/images$/nav_up.png \ - $(PRJ)$/docs$/images$/sdk_head-1.gif \ - $(PRJ)$/docs$/images$/sdk_head-2.gif \ - $(PRJ)$/docs$/images$/sdk_head-3.gif \ - $(PRJ)$/docs$/images$/sdk_line-1.gif \ - $(PRJ)$/docs$/images$/sdk_line-2.gif \ - $(PRJ)$/examples$/examples.html \ - $(PRJ)$/examples$/DevelopersGuide$/examples.html - - -$(BIN)$/odk_oo.zip : $(ODK_OO_FILES) - cd $(PRJ) && zip -urq $(subst,$(PRJ)$/, $(BIN)$/odk_oo.zip) $(subst,$(PRJ)$/, $<) $(CHECKZIPRESULT) - diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk deleted file mode 100644 index 31e526ffab98..000000000000 --- a/odk/util/makefile.pmk +++ /dev/null @@ -1,186 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -# used for sdk common files -PRODUCT_RELEASE=$(PRODUCTVERSION) -OFFICENAME=LibreOffice -SDKDIRNAME=libreoffice$(PRODUCT_RELEASE)_sdk -OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE) -TITLE=$(OFFICENAME) $(PRODUCT_RELEASE) SDK -IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API" - -PRODUCT_NAME=odkcommon -PRODUCTZIPFILE=$(PRODUCT_NAME).zip - -DESTDIR=$(OUT)/bin/$(PRODUCT_NAME) -DESTDIRBIN=$(DESTDIR)/bin -DESTDIRLIB=$(DESTDIR)/lib -DESTDIRDLL=$(DESTDIRLIB) -DESTDIRIDL=$(DESTDIR)/idl -DESTDIRINC=$(DESTDIR)/include -DESTDIRJAR=$(DESTDIR)/classes -DESTDIRSETTINGS=$(DESTDIR)/settings -DESTDIREXAMPLES=$(DESTDIR)/examples -DESTDIRCLASSES=$(DESTDIR)/classes -DESTDIRDOCU=$(DESTDIR)/docs -DESTDIRCOMMONDOCU=$(DESTDIRDOCU)/common -DESTDIRGENIDLREF=$(DESTDIRCOMMONDOCU)/ref -DESTDIRDOCUIMAGES=$(DESTDIRDOCU)/images -DESTDIRCPPDOCU=$(DESTDIRDOCU)/cpp -DESTDIRGENCPPREF=$(DESTDIRDOCU)/cpp/ref -DESTDIRJAVADOCU=$(DESTDIRDOCU)/java -DESTDIRGENJAVAREF=$(DESTDIRDOCU)/java/ref - -.IF "$(CROSS_COMPILING)" == "YES" -BINOUT=$(SOLARVERSION)/$(INPATH)/bin -.ELSE -BINOUT=$(SOLARBINDIR) -.ENDIF -INCOUT=$(SOLARINCDIR) -IDLOUT=$(SOLARIDLDIR) -XMLOUT=$(SOLARXMLDIR) -LIBOUT=$(SOLARLIBDIR) - -MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/autodoc - -.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX" || \ - "$(OS)"=="AIX" || "$(OS)"=="DRAGONFLY" -MY_COPY=$(GNUCOPY) -MY_COPY_RECURSIVE=$(GNUCOPY) -R -.ELSE -MY_COPY=$(GNUCOPY) -u -MY_COPY_RECURSIVE=$(GNUCOPY) -urf -.ENDIF - -MY_DELETE_RECURSIVE=rm -rf -MY_TEXTCOPY=@cp - -.IF "$(OS)"=="WNT" -#-------------------- -# WNT ONLY -#-------------------- - -MY_DLLPREFIX= -MY_DLLPOSTFIX=.dll -MY_DLLOUT=$(OUT)/bin -EXEPOSTFIX=.exe -DLLOUT=$(SOLARBINDIR) -DESTDIRCPPEXAMPLES=$(DESTDIR)/examples/cpp - -.IF "$(COM)"=="GCC" -DESTPLATFROM=mingw -.ELSE -DESTPLATFROM=windows -.ENDIF -DESTDIRDLL=$(DESTDIRBIN) -DESTDIRCLI=$(DESTDIR)/cli - -.ELSE -#-------------------- - -MY_DLLPREFIX=lib -.IF "$(OS)"=="MACOSX" -MY_DLLPOSTFIX=.dylib -.ELSE -MY_DLLPOSTFIX=.so -.ENDIF -MY_DLLOUT=$(OUT)/lib -DLLOUT=$(SOLARLIBDIR) - -.IF "$(OS)$(CPUNAME)"=="SOLARISSPARC" -# SOLARIS SPARC -DESTPLATFROM=solsparc - -.ELIF "$(OS)$(CPU)"=="SOLARISU" -# SOLARIS SPARC 64 -DESTPLATFROM=solsparc64 - -.ELIF "$(OS)$(CPUNAME)"=="SOLARISINTEL" -# SOLARIS INTEL -DESTPLATFROM=solintel - -.ELIF "$(OS)"=="LINUX" -# LINUX -DESTPLATFROM=linux - -.ELIF "$(OS)"=="NETBSD" -# NETBSD -DESTPLATFROM=netbsd - -.ELIF "$(OS)"=="FREEBSD" -# FREEBSD -DESTPLATFROM=freebsd - -.ELIF "$(OS)"=="DRAGONFLY" -DESTPLATFROM=dragonfly - -.ELIF "$(OS)"=="MACOSX" -# MACOSX -DESTPLATFROM=macosx - -.ELIF "$(OS)"=="AIX" -# MACOSX -DESTPLATFROM=aix - -.ENDIF - -.ENDIF - - -INCLUDETOPDIRLIST= \ - $(INCOUT)/sal \ - $(INCOUT)/salhelper \ - $(INCOUT)/rtl \ - $(INCOUT)/osl \ - $(INCOUT)/store \ - $(INCOUT)/typelib \ - $(INCOUT)/uno \ - $(INCOUT)/cppu \ - $(INCOUT)/cppuhelper \ - $(INCOUT)/registry - -.IF "$(OS)"=="WNT" -INCLUDETOPDIRLIST += $(INCOUT)/systools -.ENDIF - -INCLUDEDIRLIST:={$(subst,/,/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type d -print))} - -INCLUDEFILELIST=\ - $(INCOUT)/com/sun/star/uno/Any.h \ - $(INCOUT)/com/sun/star/uno/Any.hxx \ - $(INCOUT)/com/sun/star/uno/genfunc.h \ - $(INCOUT)/com/sun/star/uno/genfunc.hxx \ - $(INCOUT)/com/sun/star/uno/Reference.h \ - $(INCOUT)/com/sun/star/uno/Reference.hxx \ - $(INCOUT)/com/sun/star/uno/Sequence.h \ - $(INCOUT)/com/sun/star/uno/Sequence.hxx \ - $(INCOUT)/com/sun/star/uno/Type.h \ - $(INCOUT)/com/sun/star/uno/Type.hxx - -INCLUDELIST:=\ - {$(shell @$(FIND) $(INCLUDETOPDIRLIST) -type f ! \( -name "*~" -o -name "*build.lst" -o -name "*deliver.log" \) -print)} \ - $(INCLUDEFILELIST) - -SDK_CONTENT_CHECK_FILES= \ - $(MISC)/copying_files.txt - -SDK_CHECK_FLAGS= \ - $(MISC)/checkbin.txt \ - $(MISC)/checkidl.txt \ - $(MISC)/checkinc.txt \ - $(MISC)/checkinc2.txt diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk deleted file mode 100644 index bd819425e66b..000000000000 --- a/odk/util/odk_rules.pmk +++ /dev/null @@ -1,168 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - - -$(DESTDIRDOCU)/%.html : $(PRJ)/docs/%.html - @@-rm -f $@ - tr -d "\015" < $< | sed -e 's/%PRODUCT_RELEASE%/$(PRODUCT_RELEASE)/g' > $@ - -$(DESTDIREXAMPLES)/%.html : $(PRJ)/examples/%.html - @@-rm -f $@ - tr -d "\015" < $< | sed -e 's/%PRODUCT_RELEASE%/$(PRODUCT_RELEASE)/g' > $@ - -$(DESTDIR)/index.html : $(PRJ)/index.html - @@-rm -f $@ - tr -d "\015" < $< | sed -e 's/%PRODUCT_RELEASE%/$(PRODUCT_RELEASE)/g' > $@ - -$(DESTDIRDOCU)/%.css : $(PRJ)/docs/%.css - @@-rm -f $@ - $(MY_TEXTCOPY) $< $@ - -$(DESTDIRDOCUIMAGES)/% : $(PRJ)/docs/images/% - @@-rm -f $@ - $(MY_COPY) $< $@ - -$(DESTDIR)/configure : $(PRJ)/configure - @@-rm -f $@ - $(MY_TEXTCOPY) $(PRJ)/configure $@ - -$(DESTDIR)/configure.pl : $(PRJ)/configure.pl - @@-rm -f $@ - $(MY_TEXTCOPY) $(PRJ)/configure.pl $@ - -$(DESTDIR)/config.guess : $(SRC_ROOT)/config.guess - @@-rm -f $@ - $(MY_TEXTCOPY) $(SRC_ROOT)/config.guess $@ - -$(DESTDIR)/config.sub : $(SRC_ROOT)/config.sub - @@-rm -f $@ - $(MY_TEXTCOPY) $(SRC_ROOT)/config.sub $@ - -$(DESTDIR)/setsdkenv_unix : $(PRJ)/setsdkenv_unix - @@-rm -f $@ - $(MY_TEXTCOPY) $< $@ - -$(DESTDIR)/setsdkenv_unix.%.in : $(PRJ)/setsdkenv_unix.%.in - @@-rm -f $@ - $(MY_TEXTCOPY) $< $@ - -$(DESTDIR)/setsdkenv_windows.bat : $(PRJ)/setsdkenv_windows.bat - @@-rm -f $@ - $(TYPE) $< | $(SED) 's#__SDKNAME__#$(SDKDIRNAME)#' > $@ - -$(DESTDIR)/%.bat : $(PRJ)/%.bat - @@-rm -f $@ - $(MY_TEXTCOPY) $< $@ - -$(DESTDIR)/setsdkenv_windows.template : $(PRJ)/setsdkenv_windows.template - @@-rm -f $@ - $(MY_TEXTCOPY) $< $@ - -$(DESTDIR)/cfgWin.js : $(PRJ)/cfgWin.js - @@-rm -f $@ - $(MY_TEXTCOPY) $(PRJ)/cfgWin.js $@ - -$(DESTDIRSETTINGS)/%.mk : $(PRJ)/settings/%.mk - @@-rm -f $@ - $(MY_TEXTCOPY) $< $@ - -$(DESTDIRBIN)/%$(EXEPOSTFIX) : $(BINOUT)/%$(EXEPOSTFIX) - @@-rm -f $@ - $(GNUCOPY) $(BINOUT)/$(@:f) $@ - -$(DESTDIRBIN)/%.bin : $(BINOUT)/%.bin - @@-rm -f $@ - $(GNUCOPY) $(BINOUT)/$(@:f) $@ - -$(DESTDIRBIN)/unoapploader$(EXEPOSTFIX) : $(BIN)/unoapploader$(EXEPOSTFIX) - @@-rm -f $@ - $(GNUCOPY) $(BIN)/$(@:f) $@ - -# special rule for special Java UNO native library -# (used for all platforms but built only under windows; -# otherwise provided in external) -$(DESTDIRJAR)/win/unowinreg.dll : $(BIN)/unowinreg.dll - @@-rm -f $@ - $(GNUCOPY) $< $@ - -$(DESTDIRCLI)/%.dll : $(BINOUT)/%.dll - @@-rm -f $@ - $(GNUCOPY) $< $@ - -$(DESTDIRDLL)/%$(MY_DLLPOSTFIX) : $(DLLOUT)/%$(MY_DLLPOSTFIX) - @@-rm -f $@ - $(GNUCOPY) $(DLLOUT)/$(@:f) $@ - -$(DESTDIRJAR)/com/sun/star/lib/loader/%.class : $(CLASSDIR)/com/sun/star/lib/loader/%.class - @@-$(RM) $(@:db).class - $(COPY) $(<:db).class $(@:d) -# deal with subclasses - @@-$(RM) $(@:db)$(EMQ)$$*.class - -$(COPY) $(<:db)$(EMQ)$$*.class $(@:d) - -$(DESTDIRIDL)/% : $(IDLOUT)/% - $(MY_TEXTCOPY) $< $@ - -$(DESTDIRINC)/udkversion.mk : - @@-rm -f $@ - @echo #UDK version number > $@ - @echo #major >> $@ - @echo UDK_MAJOR=$(UDK_MAJOR) >> $@ - @echo #minor >> $@ - @echo UDK_MINOR=$(UDK_MINOR) >> $@ - @echo #micro >> $@ - @echo UDK_MICRO=$(UDK_MICRO) >> $@ - -$(DESTDIRINC)/% : $(INCOUT)/% - $(MY_TEXTCOPY) $< $@ - -$(DESTDIRLIB)/%.lib : $(LIBOUT)/%.lib - @@-rm -f $@ - $(GNUCOPY) $(LIBOUT)/$(@:f) $@ - -$(DESTDIRLIB)/%.a : $(LIBOUT)/%.a - @@-rm -f $@ - $(GNUCOPY) $(LIBOUT)/$(@:f) $@ - -$(DIR_CREATE_FLAG) : - $(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) | xargs -n 20 $(MKDIRHIER) && echo "dirs created" > $@ && touch $@ - $(DELAY) 2 - -$(DESTDIRSETTINGS)/component.uno.def : $(PRJ)/settings/component.uno.def - @@-rm -f $@ - $(MY_TEXTCOPY) $< $@ - -$(DESTDIRSETTINGS)/component.uno.map : $(SOLARENV)/bin/addsym.awk $(SOLARENV)/src/component.map - @@-$(RM) -f $@ -.IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SOLARENV)/src/component.map | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ -.IF "$(OS)"=="MACOSX" - tr -d "\015" < $(SOLARENV)/src/component.map | tail -n +3 | head -3 | sed -e 's/.*component/_component/g' -e 's/;[ ]*//' > $@ -.ENDIF -.ELSE # "$(COMID)"=="gcc3" - tr -d "\015" < $(SOLARENV)/src/component.map > $@ -.ENDIF # "$(COMID)"=="gcc3" - @chmod 664 $@ - -$(DIR_FILE_LIST) : $(DIR_CREATE_FLAG) - -$(DIR_FILE_FLAG) : $(DIR_FILE_LIST) - @echo "must be zipped" > $@ - - - -- cgit