Kaydet (Commit) eb7ee4d1 authored tarafından Matúš Kukan's avatar Matúš Kukan

Makefile: adapt to gbuild'ized smoketest, create target for installing

üst a391a096
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
.PHONY : all bootstrap build check clean clean-build clean-host dev-install dev-install-link distclean distro-pack-install docs fetch findunusedcode id install subsequenttest tags .PHONY : all bootstrap build check clean clean-build clean-host dev-install distclean distro-pack-install docs fetch findunusedcode id install subsequentcheck tags
ifeq ($(MAKECMDGOALS),) ifeq ($(MAKECMDGOALS),)
MAKECMDGOALS:=all MAKECMDGOALS:=all
...@@ -396,14 +396,17 @@ install: ...@@ -396,14 +396,17 @@ install:
echo "Installation finished, you can now execute:" && \ echo "Installation finished, you can now execute:" && \
echo "$(INSTALLDIR)/program/soffice" echo "$(INSTALLDIR)/program/soffice"
dev-install-link: dev-install: build
@rm -rf $(OUTDIR)/installation
@mkdir $(OUTDIR)/installation
ifeq ($(DISABLE_LINKOO),TRUE)
@ooinstall $(OUTDIR)/installation/opt
@install-gdb-printers -L
else
@ooinstall -l $(OUTDIR)/installation/opt
endif
@rm -f $(SRCDIR)/install && ln -s $(OUTDIR)/installation/opt/ $(SRCDIR)/install @rm -f $(SRCDIR)/install && ln -s $(OUTDIR)/installation/opt/ $(SRCDIR)/install
dev-install: dev-install-link
cd smoketestoo_native && \
unset MAKEFLAGS && \
$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
distro-pack-install: install distro-pack-install: install
$(SRCDIR)/bin/distro-install-clean-up $(SRCDIR)/bin/distro-install-clean-up
$(SRCDIR)/bin/distro-install-desktop-integration $(SRCDIR)/bin/distro-install-desktop-integration
...@@ -436,22 +439,14 @@ findunusedcode: ...@@ -436,22 +439,14 @@ findunusedcode:
| grep -v ^salhelper:: \ | grep -v ^salhelper:: \
> unusedcode.easy > unusedcode.easy
check: subsequentcheck_after_build check: subsequentcheck
subsequentcheck_after_build: build dev-install-link subsequentcheck: dev-install
@cd smoketestoo_native && unset MAKEFLAGS && \
$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck
subsequentcheck: smoketestoo_native
$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck
debugrun: debugrun:
$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile debugrun $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile debugrun
slowcheck:
$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile slowcheck
endif # not clean or distclean endif # not clean or distclean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment