diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-02-21 20:40:59 -0500 |
|---|---|---|
| committer | David Ostrovsky <David.Ostrovsky@gmx.de> | 2013-02-24 17:26:19 +0000 |
| commit | 1d84e9d1d363bd550129efcbeafe670c0a049dd0 (patch) | |
| tree | 8dcabefa0b1456c1a509e1973485c3f8497326c2 /Makefile.in | |
| parent | 80dd07381bc7207520a4b7fb0d06e8cc5583ee76 (diff) | |
instsetoo_native: convert to gbuild
Removes:
* instsetoo_native/util/update.xml
- gen_update_info.pl can be removed ?
On Windows the binary artifacts are created now in:
workdir/*/installation/LibreOffice_Dev/native/install/en-US/*.msi
Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259eeeed49
Reviewed-on: https://gerrit.libreoffice.org/2242
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/Makefile.in b/Makefile.in index c276b63d4316..78950098937f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -67,7 +67,7 @@ $(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake) $(BUILD echo "gbuild_modules:= tail_build \\" > $@ for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done >> $@ echo >> $@ - echo -n "dmake_modules:= helpcontent2 instsetoo_native" >> $@ + echo -n "dmake_modules:= helpcontent2" >> $@ echo >> $@ -include $(WORKDIR)/modules.mk @@ -257,7 +257,7 @@ $(WORKDIR)/bootstrap: # # Build # -build-postprocess: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) +build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) ifeq ($(DISABLE_SCRIPTING),TRUE) # We must get the headers from vbahelper "delivered" because # as we don't link to any libs from there they won't otherwise be, or @@ -270,16 +270,9 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE) # Ditto for dbconnectivity in the --disable-database-connectivity case $(GNUMAKE) connectivity endif - cd $(SRC_ROOT)/postprocess && unset MAKEFLAGS && \ + cd $(SRCDIR)/postprocess && unset MAKEFLAGS && \ $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) - -build: build-postprocess -ifeq ($(OS_FOR_BUILD),WNT) - cd $(SRC_ROOT)/instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl -else - cd $(SRC_ROOT)/instsetoo_native && unset MAKEFLAGS && \ - $(SOLARENV)/bin/build.pl -P$(PARALLELISM) -- -P$(PARALLELISM) -endif + cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ifeq ($(OS),ANDROID) cd android && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) endif @@ -322,9 +315,7 @@ dev-install: build @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) - cd $(SRC_ROOT)/instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE - unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip" - mv "$(DEVINSTALLDIR)"/LibreOffice*_archive/* "$(DEVINSTALLDIR)"/opt + cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_DEV_INSTALL=TRUE $(GMAKE_OPTIONS) else ifeq ($(DISABLE_LINKOO),TRUE) @ooinstall $(DEVINSTALLDIR)/opt @@ -413,9 +404,7 @@ install-tb: @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) - cd $(SRC_ROOT)/instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE - unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip" - mv "$(DEVINSTALLDIR)"/LibreOffice*_archive/* "$(DEVINSTALLDIR)"/opt + cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_DEV_INSTALL=TRUE $(GMAKE_OPTIONS) else @ooinstall $(DEVINSTALLDIR)/opt @install-gdb-printers |