we don't pack runtime with internal extensions

sdext/source/presenter/makefile.mk

@@ -311,47 +311,6 @@ $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
 $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
     @-$(MKDIRHIER) $(@:d)
     +$(COPY) $< $@
-.IF "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
- .IF "$(COM)"=="GCC"
-    $(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(ZIP1DIR)
- .ELSE
-    .IF "$(PACKMS)"!=""
-        .IF "$(CCNUMVER)" <= "001399999999"
-            $(GNUCOPY) $(PACKMS)$/msvcr71.dll $(ZIP1DIR)
-            $(GNUCOPY) $(PACKMS)$/msvcp71.dll $(ZIP1DIR)
-        .ELSE
-            .IF "$(CCNUMVER)" <= "001499999999"
-                $(GNUCOPY) $(PACKMS)$/msvcr80.dll $(ZIP1DIR)
-                $(GNUCOPY) $(PACKMS)$/msvcp80.dll $(ZIP1DIR)
-                $(GNUCOPY) $(PACKMS)$/msvcm80.dll $(ZIP1DIR)
-                $(GNUCOPY) $(PACKMS)$/Microsoft.VC80.CRT.manifest $(ZIP1DIR)
-            .ELSE
-                $(GNUCOPY) $(PACKMS)$/msvcr90.dll $(ZIP1DIR)
-                $(GNUCOPY) $(PACKMS)$/msvcp90.dll $(ZIP1DIR)
-                $(GNUCOPY) $(PACKMS)$/msvcm90.dll $(ZIP1DIR)
-                $(GNUCOPY) $(PACKMS)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR)
-            .ENDIF
-        .ENDIF
-    .ELSE        # "$(PACKMS)"!=""
-        .IF "$(CCNUMVER)" <= "001399999999"
-            $(GNUCOPY) $(SOLARBINDIR)$/msvcr71.dll $(ZIP1DIR)
-            $(GNUCOPY) $(SOLARBINDIR)$/msvcp71.dll $(ZIP1DIR)
-        .ELSE
-            .IF "$(CCNUMVER)" <= "001499999999"
-                $(GNUCOPY) $(SOLARBINDIR)$/msvcr80.dll $(ZIP1DIR)
-                $(GNUCOPY) $(SOLARBINDIR)$/msvcp80.dll $(ZIP1DIR)
-                $(GNUCOPY) $(SOLARBINDIR)$/msvcm80.dll $(ZIP1DIR)
-                $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC80.CRT.manifest $(ZIP1DIR)
-            .ELSE
-                $(GNUCOPY) $(SOLARBINDIR)$/msvcr90.dll $(ZIP1DIR)
-                $(GNUCOPY) $(SOLARBINDIR)$/msvcp90.dll $(ZIP1DIR)
-                $(GNUCOPY) $(SOLARBINDIR)$/msvcm90.dll $(ZIP1DIR)
-                $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR)
-            .ENDIF
-        .ENDIF
-    .ENDIF         # "$(PACKMS)"!=""
- .ENDIF	#"$(COM)"=="GCC"
-.ENDIF #"$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
 
 $(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
 

solenv/inc/extension_post.mk

@@ -65,74 +65,12 @@ $(COMPONENT_JARFILES) : $(CLASSDIR)/$$(@:f)
 .ENDIF			# "$(COMPONENT_JARFILES)"!=""
 
 .IF "$(COMPONENT_LIBRARIES)"!=""
-PACK_RUNTIME!:=TRUE
 # TODO(Q3): strip the binary?
 $(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 .ENDIF			# "$(COMPONENT_LIBRARIES)"!=""
 
-.IF "$(PACK_RUNTIME)"!=""
-PACK_RUNTIME_FLAG:=$(MISC)/$(TARGET)_pack_runtime.flag
-.IF "$(depend)" == ""
-$(EXTENSION_TARGET) : $(PACK_RUNTIME_FLAG)
-.END
-
-$(EXTENSIONDIR) :
-    @@-$(MKDIRHIER) $(@:d)
-
-$(PACK_RUNTIME_FLAG) : $(EXTENSIONDIR)
-    @@-$(MKDIRHIER) $(@:d)
-.IF "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
-.IF "$(COM)"=="GCC"
-   $(GNUCOPY) $(SOLARBINDIR)/mingwm10.dll $(EXTENSIONDIR)
-   .IF "$(MINGW_GCCDLL)"!=""
-     $(GNUCOPY) $(SOLARBINDIR)/$(MINGW_GCCDLL) $(EXTENSIONDIR)
-   .ENDIF
-   .IF "$(MINGW_GXXDLL)"!=""
-     $(GNUCOPY) $(SOLARBINDIR)/$(MINGW_GXXDLL) $(EXTENSIONDIR)
-   .ENDIF
-.ELSE
-.IF "$(PACKMS)"!=""
-.IF "$(CCNUMVER)" <= "001399999999"
-    $(GNUCOPY) $(PACKMS)/msvcr71.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)/msvcp71.dll $(EXTENSIONDIR)
-.ELSE			# "$(CCNUMVER)" <= "001399999999"
-.IF "$(CCNUMVER)" <= "001499999999"
-    $(GNUCOPY) $(PACKMS)/msvcr80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)/msvcp80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)/msvcm80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
-.ELSE			# "$(CCNUMVER)" <= "001499999999"
-    $(GNUCOPY) $(PACKMS)/msvcr90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)/msvcp90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)/msvcm90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR)
-.ENDIF 			# "$(CCNUMVER)" <= "001499999999"
-.ENDIF			# "$(CCNUMVER)" <= "001399999999"
-.ELSE        # "$(PACKMS)"!=""
-.IF "$(CCNUMVER)" <= "001399999999"
-    $(GNUCOPY) $(SOLARBINDIR)/msvcr71.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)/msvcp71.dll $(EXTENSIONDIR)
-.ELSE			# "$(CCNUMVER)" <= "001399999999"
-.IF "$(CCNUMVER)" <= "001499999999"
-    $(GNUCOPY) $(SOLARBINDIR)/msvcr80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)/msvcp80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)/msvcm80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
-.ELSE    		# "$(CCNUMVER)" <= "001499999999"
-    $(GNUCOPY) $(SOLARBINDIR)/msvcr90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)/msvcp90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)/msvcm90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR)
-.ENDIF			# "$(CCNUMVER)" <= "001499999999"
-.ENDIF			# "$(CCNUMVER)" <= "001399999999"
-.ENDIF          # "$(PACKMS)"!=""
-.ENDIF	#"$(COM)"=="GCC" 
-.ENDIF 			# "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
-    @$(TOUCH) $@
-.ENDIF			# "$(PACK_RUNTIME)"!=""
-
 IMPLEMENTATION_IDENTIFIER*="com.sun.star.$(EXTENSIONNAME)-$(PLATFORMID)"
 
 .INCLUDE .IGNORE : $(MISC)/$(TARGET)_lang_track.mk