mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

let make dev-install do something useful on MSVC

Browse Source 
Forcing creation of second installation set is perhaps not ideal,
but i have no idea how that installer perl crud work and
at least it gives something to run tests against.

Change-Id: I506160013de23f76128c9e39b4f3bacc6e32cc7a
This commit is contained in:
Michael Stahl
2012-07-15 22:58:52 +02:00
parent 01550a7450
commit 0ec45dc41d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.top
View File

@@ -394,7 +394,8 @@ endif
build: build-packimages build: build-packimages
ifeq ($(OS_FOR_BUILD),WNT) ifeq ($(OS_FOR_BUILD),WNT)
cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl cd instsetoo_native && unset MAKEFLAGS && \
$(SOLARENV)/bin/build.pl FORCE2ARCHIVE=TRUE
else else
cd instsetoo_native && unset MAKEFLAGS && \ cd instsetoo_native && unset MAKEFLAGS && \
$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM) $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
@@ -425,11 +426,16 @@ install-strip:
dev-install: build dev-install: build
@rm -rf $(DEVINSTALLDIR) @rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR)
ifeq ($(OS_FOR_BUILD),WNT)
unzip -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip"
mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
else
ifeq ($(DISABLE_LINKOO),TRUE) ifeq ($(DISABLE_LINKOO),TRUE)
@ooinstall $(DEVINSTALLDIR)/opt @ooinstall $(DEVINSTALLDIR)/opt
@install-gdb-printers -L @install-gdb-printers -L
else else
@ooinstall -l $(DEVINSTALLDIR)/opt @ooinstall -l $(DEVINSTALLDIR)/opt
endif
endif endif
@rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install