[Libreoffice-commits] .: 2 commits - ios/qa

[Tor Lillqvist]

 ios/qa/sc/Makefile       |    2 +-
 ios/qa/sc/filters-test.m |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 1f36132b1995dc1e89d2b0b372f5805a9d3c5a95
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Mar 8 23:30:03 2012 +0200

    Set SRC_ROOT and OUTDIR_FOR_BUILD (!) to get it get a bit further along

diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m
index 88de28a..19be41e 100644
--- a/ios/qa/sc/filters-test.m
+++ b/ios/qa/sc/filters-test.m
@@ -27,6 +27,8 @@
  * instead of those above.
  */
 
+#include <stdlib.h>
+
 #import <UIKit/UIKit.h>
 
 #include "cppunit/extensions/TestFactoryRegistry.h"
@@ -67,6 +69,11 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions
   self.window = uiw;
   [uiw release];
 
+  // See unotest/source/cpp/bootstrapfixturebase.cxx
+  const char *app_root = [[[NSBundle mainBundle] bundlePath] UTF8String];
+  setenv("SRC_ROOT", app_root, 1);
+  setenv("OUTDIR_FOR_BUILD", app_root, 1);
+
   CppUnitTestPlugIn *iface = cppunitTestPlugIn();
   iface->initialize(&CppUnit::TestFactoryRegistry::getRegistry(), CppUnit::PlugInParameters());
 
commit 82a8c4cf35abdd7d8db323068bd0a840b4901ee3
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Mar 7 17:15:08 2012 +0200

    Add more libs

diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index 1300785..1cbbb01 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -30,7 +30,7 @@ SRCS = filters-test.m
 
 CFLAGS = $(SOLARINC)
 
-LIBS = -Wl,$(OUTDIR)/bin/cppunit/cppunittester.a -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a -Wl,$(OUTDIR)/lib/bootstrap.uno.a -Wl,$(OUTDIR)/lib/unoexceptionprotector.a $(SOLARLIB) -lavmedialo -lbasegfxlo -lcomphelpgcc3 -lcppunit -ldrawinglayerlo -leditenglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licuuc -ljpeg -ljvmfwk -llnglo -lreg -lsal_textenc -lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -lsotlo -ltest -ltklo -ltllo -lucbhelper4gcc3 -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc
+LIBS = -Wl,$(OUTDIR)/bin/cppunit/cppunittester.a -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a -Wl,$(OUTDIR)/lib/bootstrap.uno.a -Wl,$(OUTDIR)/lib/unoexceptionprotector.a $(SOLARLIB) -lavmedialo -lbasegfxlo -lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit -ldrawinglayerlo -leditenglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licuuc -ljpeg -ljvmfwk -llnglo -lreg -lsal_textenc -lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -lsotlo -ltest -ltklo -ltllo -lucbhelper4gcc3 -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc
 
 all: $(APPDIR)/$(APP)