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

bodge callcatcher build back to half-life

Browse Source 
Change-Id: I91393aa912bd69f3fbeb67d895ff7d8021effccb
This commit is contained in:
Caolán McNamara
2013-06-19 16:46:21 +01:00
parent 38d2ea2b25
commit 8fd1bd1879
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.in
View File

@@ -380,11 +380,13 @@ docs:
findunusedcode: findunusedcode:
@which callcatcher > /dev/null 2>&1 || \ @which callcatcher > /dev/null 2>&1 || \
(echo "callcatcher not installed" && false) (echo "callcatcher not installed" && false)
@sed -e s,$$INPATH,callcatcher,g config_host.mk | sed -e s,"export OOO_JUNIT_JAR=.*","export OOO_JUNIT_JAR=",g > $(SRCDIR)/config_host_callcatcher.mk @mkdir -p $(SRCDIR)/callcatcher/config_host
@echo unexport ARCH_FLAGS >> $(SRCDIR)/config_host_callcatcher.mk @cp config_host/* callcatcher/config_host
@echo unexport CFLAGS >> $(SRCDIR)/config_host_callcatcher.mk @cp config_host.mk* callcatcher
@echo unexport CXXFLAGS >> $(SRCDIR)/config_host_callcatcher.mk @sed -e s,$$INPATH,callcatcher,g config_host.mk | sed -e s,"export OOO_JUNIT_JAR=.*","export OOO_JUNIT_JAR=",g > $(SRCDIR)/callcatcher/config_host.mk
@mkdir -p $(SRCDIR)/solenv/callcatcher/bin && \ @echo unexport ARCH_FLAGS >> $(SRCDIR)/callcatcher/config_host.mk
@echo unexport CFLAGS >> $(SRCDIR)/callcatcher/config_host.mk
@echo unexport CXXFLAGS >> $(SRCDIR)/callcatcher/config_host.mk
$(GNUMAKE) -f $(SOLARENV)/bin/callcatcher.Makefile findunusedcode $(GNUMAKE) -f $(SOLARENV)/bin/callcatcher.Makefile findunusedcode
@grep ::.*\( unusedcode.all \ @grep ::.*\( unusedcode.all \
| grep -v ^Atom \ | grep -v ^Atom \

6
solenv/bin/callcatcher.Makefile
View File

@@ -9,7 +9,7 @@
.PHONY: all .PHONY: all
include config_host_callcatcher.mk include callcatcher/config_host.mk
export CC:=callcatcher $(CC) export CC:=callcatcher $(CC)
export CXX:=callcatcher $(CXX) export CXX:=callcatcher $(CXX)
@@ -23,9 +23,9 @@ export dbglevel:=2
include $(SOLARENV)/gbuild/gbuild.mk include $(SOLARENV)/gbuild/gbuild.mk
findunusedcode: findunusedcode:
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild $(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
ooinstall -l $(DEVINSTALLDIR)/opt ooinstall -l $(DEVINSTALLDIR)/opt
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild subsequentcheck $(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild subsequentcheck
callanalyse $(WORKDIR)/LinkTarget/*/* $(WORKDIR)/LinkTarget/*/*/* \ callanalyse $(WORKDIR)/LinkTarget/*/* $(WORKDIR)/LinkTarget/*/*/* \
$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \ $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \
> unusedcode.all > unusedcode.all