ooo-build r12904 - trunk/patches/dev300



Author: rengelhard
Date: Mon Jun 16 21:59:13 2008
New Revision: 12904
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12904&view=rev

Log:
fix order...

Modified:
   trunk/patches/dev300/solenv-no-extension-license.diff

Modified: trunk/patches/dev300/solenv-no-extension-license.diff
==============================================================================
--- trunk/patches/dev300/solenv-no-extension-license.diff	(original)
+++ trunk/patches/dev300/solenv-no-extension-license.diff	Mon Jun 16 21:59:13 2008
@@ -5,6 +5,14 @@
 diff -u -u -r1.2 extension_post.mk
 --- solenv/inc/extension_post.mk	6 Jun 2008 08:10:54 -0000	1.2
 +++ solenv/inc/extension_post.mk	16 Jun 2008 15:01:36 -0000
+@@ -112,7 +112,6 @@
+ .ENDIF			# "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
+ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
+ 	@@-$(MKDIRHIER) $(@:d)
+-	$(PERL) $(SOLARENV)$/bin$/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $  $(EXTNAME)
+ 	@echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
+ 	$(TYPE) $  $(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $(MISC)$/desc.tmp.$(EXTNAME)
+ 	@@-$(RM) $  $(EXTNAME)
 @@ -119,21 +119,6 @@
  	$(TYPE) $(MISC)$/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
  	@@-$(RM) $(MISC)$/desc.tmp.$(EXTNAME)
@@ -27,14 +35,6 @@
  #$(COMPONENT_MANIFEST) : $$(@:f)
  $(COMPONENT_MANIFEST) : $(MANIFEST_SRC) $(MANIFEST_DEPS)
  	@@-$(MKDIRHIER) $(@:d)
-@@ -112,7 +112,6 @@
- .ENDIF			# "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
- $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
- 	@@-$(MKDIRHIER) $(@:d)
--	$(PERL) $(SOLARENV)$/bin$/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $  $(EXTNAME)
- 	@echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
- 	$(TYPE) $  $(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $(MISC)$/desc.tmp.$(EXTNAME)
- 	@@-$(RM) $  $(EXTNAME)
 Index: extension_pre.mk
 ===================================================================
 RCS file: /cvs/tools/solenv/inc/extension_pre.mk,v



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]