[Libreoffice-commits] .: 6 commits - cli_ure/prj cppuhelper/prj idlc/source io/prj jvmaccess/prj jvmfwk/prj offapi/prj offuh/prj rdbmaker/source remotebridges/prj ridljar/prj sal/cppunittester stoc/prj udkapi/prj unoil/prj
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Jun 16 16:13:39 PDT 2011
cli_ure/prj/build.lst | 2 +-
cppuhelper/prj/build.lst | 2 +-
idlc/source/makefile.mk | 6 ------
idlc/source/preproc/makefile.mk | 5 -----
io/prj/build.lst | 2 +-
jvmaccess/prj/d.lst | 2 +-
jvmfwk/prj/d.lst | 2 +-
offapi/prj/build.lst | 2 +-
offuh/prj/build.lst | 2 +-
rdbmaker/source/rdbmaker/makefile.mk | 5 -----
remotebridges/prj/build.lst | 2 +-
ridljar/prj/build.lst | 2 +-
sal/cppunittester/makefile.mk | 4 ----
stoc/prj/build.lst | 2 +-
udkapi/prj/build.lst | 2 +-
unoil/prj/build.lst | 2 +-
16 files changed, 12 insertions(+), 32 deletions(-)
New commits:
commit 8804ae404d33d907d187758f44e4a9ef124c13cd
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 19:03:23 2011 +0300
Do build cppunittester when cross-compiling after all
diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk
index 65b600b..938b63d 100644
--- a/sal/cppunittester/makefile.mk
+++ b/sal/cppunittester/makefile.mk
@@ -33,8 +33,6 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
-.IF "$(CROSS_COMPILING)"!="YES"
-
CFLAGSCXX += $(CPPUNIT_CFLAGS)
OBJFILES = $(APP1OBJS)
@@ -44,6 +42,4 @@ APP1RPATH = NONE
APP1STDLIBS = $(CPPUNITLIB) $(SALLIB)
APP1TARGET = cppunittester
-.ENDIF
-
.INCLUDE: target.mk
commit 20d40664dd068d2c6ad5914f2fb142fcef799daa
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 10:58:07 2011 +0300
Be less picky with library names to match also the static library built for iOS
diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst
index 779ede7..09bc295 100644
--- a/jvmfwk/prj/d.lst
+++ b/jvmfwk/prj/d.lst
@@ -2,7 +2,7 @@ mkdir: %_DEST%\inc\jvmfwk
..\inc\jvmfwk\framework.h %_DEST%\inc\jvmfwk\framework.h
..\inc\jvmfwk\vendorplugin.h %_DEST%\inc\jvmfwk\vendorplugin.h
..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib\ijvmfwk.lib
-..\%__SRC%\lib\libjvmfwk.*.* %_DEST%\lib\*
+..\%__SRC%\lib\libjvmfwk.* %_DEST%\lib\*
..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin\*
..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin\*
..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib\*
commit 549118f40d64fa684479d3a3a93a4f20bcbce7af
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 01:35:12 2011 +0300
Be less picky with library names to match also the static library built for iOS
diff --git a/jvmaccess/prj/d.lst b/jvmaccess/prj/d.lst
index 42f019d..56d9e83 100644
--- a/jvmaccess/prj/d.lst
+++ b/jvmaccess/prj/d.lst
@@ -4,5 +4,5 @@ mkdir: %_DEST%\inc\jvmaccess
..\inc\jvmaccess\virtualmachine.hxx %_DEST%\inc\jvmaccess\virtualmachine.hxx
..\%__SRC%\bin\jvmacces*.dll %_DEST%\bin\*
..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib\ijvmaccess.lib
-..\%__SRC%\lib\libjvmaccess*.*.* %_DEST%\lib\*
+..\%__SRC%\lib\libjvmaccess*.* %_DEST%\lib\*
linklib: libjvmaccess*.*.*
commit 8b952bb36669307b0f03f76d8bfad3a66a4d6b26
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 01:19:35 2011 +0300
Use DESKTOP and NATIVE where appropriate
diff --git a/cli_ure/prj/build.lst b/cli_ure/prj/build.lst
index c9ac99c..a46a829 100644
--- a/cli_ure/prj/build.lst
+++ b/cli_ure/prj/build.lst
@@ -1,4 +1,4 @@
-ure cli_ure : cppu cppuhelper sal codemaker stoc udkapi bridges NULL
+ure cli_ure : cppu cppuhelper sal DESKTOP:codemaker stoc udkapi bridges NULL
ure cli_ure usr1 - all ure_mkout NULL
ure cli_ure\inc nmake - all ure_inc NULL
ure cli_ure\version nmake - all ure_source_version ure_inc NULL
diff --git a/cppuhelper/prj/build.lst b/cppuhelper/prj/build.lst
index 4ff92ed..e253cc0 100644
--- a/cppuhelper/prj/build.lst
+++ b/cppuhelper/prj/build.lst
@@ -1,4 +1,4 @@
-ch cppuhelper : BOOST:boost LIBXSLT:libxslt codemaker cppu offuh NULL
+ch cppuhelper : BOOST:boost LIBXSLT:libxslt DESKTOP:codemaker cppu offuh NULL
ch cppuhelper usr1 - all ch_mkout NULL
ch cppuhelper\inc nmake - all ch_include NULL
ch cppuhelper\source nmake - all ch_source ch_unotypes ch_include NULL
diff --git a/io/prj/build.lst b/io/prj/build.lst
index f2be62d..eab94bf 100644
--- a/io/prj/build.lst
+++ b/io/prj/build.lst
@@ -1,4 +1,4 @@
-io io : LIBXSLT:libxslt rdbmaker NULL
+io io : LIBXSLT:libxslt DESKTOP:rdbmaker NULL
io io usr1 - all io_mkout NULL
io io\inc nmake - all io_inc NULL
io io\source\acceptor nmake - all io_acceptor io_connector io_inc NULL
diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst
index c3a5f06..5003186 100644
--- a/offapi/prj/build.lst
+++ b/offapi/prj/build.lst
@@ -1,4 +1,4 @@
-oa offapi : udkapi idlc solenv NULL
+oa offapi : udkapi DESKTOP:idlc solenv NULL
oa offapi usr1 - all oa_mkout NULL
oa offapi\com\sun\star\script nmake - all oa_script oa_embed NULL
oa offapi\com\sun\star\script\browse nmake - all oa_sfbrowse NULL
diff --git a/offuh/prj/build.lst b/offuh/prj/build.lst
index e98f356..702facf 100644
--- a/offuh/prj/build.lst
+++ b/offuh/prj/build.lst
@@ -1,4 +1,4 @@
-ou offuh :: offapi oovbaapi codemaker NULL
+ou offuh :: offapi oovbaapi DESKTOP:codemaker NULL
ou offuh usr1 - all ou_mkout NULL
ou offuh\prj get - all ou_prj NULL
ou offuh\source nmake - all ou_source NULL
diff --git a/remotebridges/prj/build.lst b/remotebridges/prj/build.lst
index 5f2a661..47ad4c3 100644
--- a/remotebridges/prj/build.lst
+++ b/remotebridges/prj/build.lst
@@ -1,2 +1,2 @@
-rb remotebridges : LIBXSLT:libxslt cppu cppuhelper offuh rdbmaker sal NULL
+rb remotebridges : LIBXSLT:libxslt cppu cppuhelper offuh DESKTOP:rdbmaker sal NULL
rb remotebridges\source\unourl_resolver nmake - all rb_urlresolv NULL
diff --git a/ridljar/prj/build.lst b/ridljar/prj/build.lst
index ac91c68..b0aca08 100644
--- a/ridljar/prj/build.lst
+++ b/ridljar/prj/build.lst
@@ -1,4 +1,4 @@
-ri ridljar : codemaker solenv udkapi NULL
+ri ridljar : DESKTOP:codemaker solenv udkapi NULL
ri ridljar\javamaker nmake - all javamaker NULL
ri ridljar\com nmake - all com javamaker NULL
ri ridljar\util nmake - all util javamaker com NULL
diff --git a/stoc/prj/build.lst b/stoc/prj/build.lst
index 256f094..6737d70 100644
--- a/stoc/prj/build.lst
+++ b/stoc/prj/build.lst
@@ -1,4 +1,4 @@
-tc stoc : rdbmaker cppuhelper cppu jvmaccess sal salhelper jvmfwk xmlreader LIBXSTL:libxslt NULL
+tc stoc : DESKTOP:rdbmaker cppuhelper cppu jvmaccess sal salhelper jvmfwk xmlreader LIBXSTL:libxslt NULL
tc stoc usr1 - all tc_mkout NULL
tc stoc\inc nmake - all tc_inc NULL
tc stoc\source\defaultregistry nmake - all tc_defr tc_boot tc_inc NULL
diff --git a/udkapi/prj/build.lst b/udkapi/prj/build.lst
index 071723a..84520f8 100644
--- a/udkapi/prj/build.lst
+++ b/udkapi/prj/build.lst
@@ -1,4 +1,4 @@
-ua udkapi : idlc NULL
+ua udkapi : DESKTOP:idlc NULL
ua udkapi usr1 - all ua_mkout NULL
ua udkapi\com\sun\star\beans nmake - all ua_bean NULL
ua udkapi\com\sun\star\bridge nmake - all ua_brid NULL
diff --git a/unoil/prj/build.lst b/unoil/prj/build.lst
index c229639..15104e8 100644
--- a/unoil/prj/build.lst
+++ b/unoil/prj/build.lst
@@ -1,4 +1,4 @@
-ul unoil :: codemaker offapi ridljar solenv cli_ure NULL
+ul unoil :: DESKTOP:codemaker offapi ridljar solenv cli_ure NULL
ul unoil\javamaker nmake - all ul_javamaker NULL
ul unoil\util nmake - all ul_util ul_javamaker NULL
ul unoil\climaker nmake - all ul_climaker NULL
\ No newline at end of file
commit cc01633b548e839bb6d1b1aa2687bde29b8977ed
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 00:53:09 2011 +0300
We do need to build this when cross-compiling to DESKTOP platforms
diff --git a/idlc/source/makefile.mk b/idlc/source/makefile.mk
index 7b85efd..0f4232f 100644
--- a/idlc/source/makefile.mk
+++ b/idlc/source/makefile.mk
@@ -37,12 +37,6 @@ INCPRE=$(MISC)
# --- Settings -----------------------------------------------------
-
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
- @echo Nothing done when cross-compiling
-.ENDIF
-
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
diff --git a/idlc/source/preproc/makefile.mk b/idlc/source/preproc/makefile.mk
index 6afe98f..e6aa457 100644
--- a/idlc/source/preproc/makefile.mk
+++ b/idlc/source/preproc/makefile.mk
@@ -38,11 +38,6 @@ LIBSALCPPRT=$(0)
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
- @echo Nothing done when cross-compiling
-.ENDIF
-
# --- Files --------------------------------------------------------
OBJFILES= \
commit c12d0402263f39fab8169a57a4545526342ed74c
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Jun 15 23:21:15 2011 +0300
Revert "No point building build-time executables for iOS"
Handle this using BUILD_TYPE instead.
This reverts commit 47b5eed7121305d375cfc9a6fd1ba21ff1430130.
diff --git a/rdbmaker/source/rdbmaker/makefile.mk b/rdbmaker/source/rdbmaker/makefile.mk
index 4c93b8b..8b41a93 100644
--- a/rdbmaker/source/rdbmaker/makefile.mk
+++ b/rdbmaker/source/rdbmaker/makefile.mk
@@ -37,11 +37,6 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-.IF "$(OS)" == "IOS"
-all:
- @echo No point in build-time executables for this platform
-.ENDIF
-
OBJFILES= $(OBJ)$/rdbmaker.obj \
$(OBJ)$/rdboptions.obj \
$(OBJ)$/typeblop.obj \
More information about the Libreoffice-commits
mailing list