[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - set_soenv.in solenv/inc

[Fridrich Strba]

 set_soenv.in                 |    1 +
 solenv/inc/extension_post.mk |   13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 70df6dbdb1b82fc1b8fe94226e63b86864efed22
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Dec 13 20:39:47 2010 +0100

    Don't bundle runtime dlls with extensions included with the installation

diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 868ef4b..4df951c 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -73,7 +73,7 @@ $(COMPONENT_JARFILES) : $(CLASSDIR)/$$(@:f)
 $(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COMMAND_ECHO)$(COPY) $< $@
-.IF "$(OS)$(CPU)"=="WNTI"
+.IF "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
 .IF "$(COM)"=="GCC"
    $(GNUCOPY) $(SOLARBINDIR)/mingwm10.dll $(EXTENSIONDIR)
    .IF "$(MINGW_GCCDLL)"!=""
@@ -119,7 +119,7 @@ $(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@:f)
 .ENDIF			# "$(CCNUMVER)" <= "001399999999"
 .ENDIF          # "$(PACKMS)"!=""
 .ENDIF	#"$(COM)"=="GCC" 
-.ENDIF 			# "$(OS)$(CPU)"=="WNTI"
+.ENDIF 			# "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
 .ENDIF			# "$(COMPONENT_LIBRARIES)"!=""
 
 IMPLEMENTATION_IDENTIFIER*="com.sun.star.$(EXTENSIONNAME)-$(PLATFORMID)"
@@ -135,15 +135,14 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
 
     $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.1.$(EXTNAME)
 
-    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/transform_description.pl $@.1.$(EXTNAME) $@.2.$(EXTNAME)
+    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/transform_description.pl $(DESCRIPTION_SRC) $@.1.$(EXTNAME)
+
+    $(COMMAND_ECHO)$(TYPE) $@.1.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $@.2.$(EXTNAME)
     @@-$(RM) $@.1.$(EXTNAME)
 
-    $(COMMAND_ECHO)$(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $@.3.$(EXTNAME)
+    $(COMMAND_ECHO)$(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
     @@-$(RM) $@.2.$(EXTNAME)
 
-    $(COMMAND_ECHO)$(TYPE) $@.3.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
-    @@-$(RM) $@.3.$(EXTNAME)
-
 .ENDIF			# "$(DESCRIPTION)"!=""
 # default OOo license text!!!
 # may not fit...
commit 46cf523498b7fa0cee79f683dafc8662f7406a15
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Dec 13 20:38:28 2010 +0100

    Propagate the WITH_EXTENSION_INTEGRATION variable to build environment

diff --git a/set_soenv.in b/set_soenv.in
index b6cce64..ef3df95 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1690,6 +1690,7 @@ ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
 ToFile( "ENABLE_UNIX_QUICKSTARTER", "@ENABLE_UNIX_QUICKSTARTER@", "e" );
 ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
 ToFile( "WITH_THEMES",       "@WITH_THEMES@",      "e");
+ToFile( "WITH_EXTENSION_INTEGRATION",       "@WITH_EXTENSION_INTEGRATION@",      "e");
 ToFile( "OOO_JUNIT_JAR",     "@OOO_JUNIT_JAR@",    "e" );
 ToFile( "SAC_JAR",           "@SAC_JAR@",          "e" );
 ToFile( "LIBXML_JAR",        "@LIBXML_JAR@",       "e" );