ooo-build r13545 - in trunk: . bin bin/piece doc patches/dev300

From: michael svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13545 - in trunk: . bin bin/piece doc patches/dev300
Date: Wed, 13 Aug 2008 16:17:06 +0000 (UTC)
Author: michael
Date: Wed Aug 13 16:17:06 2008
New Revision: 13545
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13545&view=rev

Log:
2008-08-13  Michael Meeks  <michael meeks novell com>

        * patches/dev300/redirect-extensions.diff: update for more
        vectors.

        * patches/dev300/piece-automation.diff: fix image bits.
        * patches/dev300/piece-setup_native.diff: work around
        oddness with $(RPM).

        * bin/Makefile.am, Makefile.shared: dist applyflags,
        and kill the evil cut/paste.



Added:
   trunk/patches/dev300/piece-automation.diff
Modified:
   trunk/ChangeLog
   trunk/Makefile.shared
   trunk/bin/Makefile.am
   trunk/bin/piece/install-bootstrap
   trunk/doc/split.txt
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-setup_native.diff
   trunk/patches/dev300/redirect-extensions.diff

Modified: trunk/Makefile.shared
==============================================================================
--- trunk/Makefile.shared	(original)
+++ trunk/Makefile.shared	Wed Aug 13 16:17:06 2008
@@ -13,28 +13,7 @@
 	$(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR)
 	-test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare
 	if test -d $(OOBUILDDIR)/applied_patches ; then \
-		FLAGS="--distro=$(DISTRO)"; \
-		if test -d $(OOBUILDDIR)/binfilter ; then \
-			FLAGS="$$FLAGS --distro=Binfilter"; \
-		fi ; \
-		if test -d $(OOBUILDDIR)/zlib; then \
-		    FLAGS="$$FLAGS --distro=System"; \
-		fi ; \
-		if test -d $(OOBUILDDIR)/sdk_oo ; then \
-			FLAGS="$$FLAGS --distro=Sdk"; \
-		fi ; \
-		if grep localize.sdf $(OOBUILDDIR)/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then \
-			FLAGS="$$FLAGS --distro=Localize"; \
-		fi ; \
-		if test -d $(OOBUILDDIR)/swext ; then \
-			FLAGS="$$FLAGS --distro=swext"; \
-		fi ; \
-		if test -n "$(OOO_ADDITIONAL_SECTIONS)" ; then \
-			FLAGS="$$FLAGS --additional-sections=$(OOO_ADDITIONAL_SECTIONS)"; \
-		fi ; \
-		if test "z$(PIECE)" != "z"; then \
-			FLAGS="$$FLAGS --pieces --distro=Piece"; \
-		fi ; \
+		FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \
 		chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -f -R ; \
 	fi
 	cd $(top_srcdir)/bin ; ./unpack
@@ -68,28 +47,7 @@
 
 	$(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR)
 	-test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare
-	FLAGS="--distro=$(DISTRO)"; \
-	if test -d $(OOBUILDDIR)/binfilter ; then \
-		FLAGS="$$FLAGS --distro=Binfilter"; \
-	fi ; \
-	if test -d $(OOBUILDDIR)/zlib; then \
-		FLAGS="$$FLAGS --distro=System"; \
-	fi ; \
-	if test -d $(OOBUILDDIR)/sdk_oo ; then \
-		FLAGS="$$FLAGS --distro=Sdk"; \
-	fi ; \
-	if test '$(OOO_LANGS)' != 'en-US' ; then \
-		FLAGS="$$FLAGS --distro=Localize"; \
-	fi ; \
-	if test -d $(OOBUILDDIR)/swext ; then \
-		FLAGS="$$FLAGS --distro=swext"; \
-	fi ; \
-	if test -n "$(OOO_ADDITIONAL_SECTIONS)" ; then \
-		FLAGS="$$FLAGS --additional-sections=$(OOO_ADDITIONAL_SECTIONS)"; \
-	fi ; \
-	if test "z$(PIECE)" != "z"; then \
-		FLAGS="$$FLAGS --pieces --distro=Piece"; \
-	fi ; \
+	FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \
 	chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --tag=$(CVSTAG) ;
 	-test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare
 	$(TOOLSDIR)/bin/transform --apply $(TOOLSDIR) $(OOBUILDDIR)
@@ -100,28 +58,7 @@
 
 patch.unapply:
 	$(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR)
-	FLAGS="--distro=$(DISTRO)"; \
-	if test -d $(OOBUILDDIR)/binfilter ; then \
-		FLAGS="$$FLAGS --distro=Binfilter"; \
-	fi ; \
-	if test -d $(OOBUILDDIR)/zlib ; then \
-		FLAGS="$$FLAGS --distro=System"; \
-	fi ; \
-	if test -d $(OOBUILDDIR)/sdk_oo ; then \
-		FLAGS="$$FLAGS --distro=Sdk"; \
-	fi ; \
-	if grep localize.sdf $(OOBUILDDIR)/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then \
-		FLAGS="$$FLAGS --distro=Localize"; \
-	fi ; \
-	if test -d $(OOBUILDDIR)/swext ; then \
-		FLAGS="$$FLAGS --distro=swext"; \
-	fi ; \
-	if test -n "$(OOO_ADDITIONAL_SECTIONS)" ; then \
-		FLAGS="$$FLAGS --additional-sections=$(OOO_ADDITIONAL_SECTIONS)"; \
-	fi ; \
-	if test "z$(PIECE)" != "z"; then \
-		FLAGS="$$FLAGS --pieces --distro=Piece"; \
-	fi ; \
+	FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \
 	chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -R ;
 	rm -f $(STAMP_DIR)/patch.apply
 

Modified: trunk/bin/Makefile.am
==============================================================================
--- trunk/bin/Makefile.am	(original)
+++ trunk/bin/Makefile.am	Wed Aug 13 16:17:06 2008
@@ -1,6 +1,7 @@
 SUBDIRS=piece
 
 script_files = \
+	applyflags \
 	a2az.pl \
 	bash-completion.in \
 	build-galleries \

Modified: trunk/bin/piece/install-bootstrap
==============================================================================
--- trunk/bin/piece/install-bootstrap	(original)
+++ trunk/bin/piece/install-bootstrap	Wed Aug 13 16:17:06 2008
@@ -14,8 +14,8 @@
 # ooo-build
 mkdir -p $OOINSTDIR/ooo-build/bin
 mkdir -p $OOINSTDIR/ooo-build/patches
-cp -R $TOOLSDIR/bin/* $OOINSTDIR/ooo-build/bin
-cp -R $TOOLSDIR/patches/* $OOINSTDIR/ooo-build/patches
+cp -a $TOOLSDIR/bin/* $OOINSTDIR/ooo-build/bin
+cp -a $TOOLSDIR/patches/* $OOINSTDIR/ooo-build/patches
 
 # copy pieces of interest into src to be moved out later ...
 echo "copy source pieces"

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Wed Aug 13 16:17:06 2008
@@ -322,15 +322,6 @@
 		+ needed *both* basis3.0 and ure ...
 		+ can we hack the installer, to build one services.rdb
 		  per module ? [ might be easier ! ].
-	+ split Makefile.shared image installation into
-	  a custom "install-images" script
-		+ $src $dest type thing ...
-		+ if $dest exists -> install into it in each
-		  case ...
-		+ call in build-generic.
-	+ clean Makefile.shared while I'm there ...
-		+ get the flag building done cleanly ...
-		+ [!] ...
 
 * FIXME:
 	+ done in the cleanup section ?

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Aug 13 16:17:06 2008
@@ -2451,7 +2451,7 @@
 piece-xmerge.diff
 piece-postprocess.diff
 piece-packimages.diff
-
+piece-automation.diff
 
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten

Added: trunk/patches/dev300/piece-automation.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-automation.diff	Wed Aug 13 16:17:06 2008
@@ -0,0 +1,23 @@
+Index: automation/packimages/makefile.mk
+===================================================================
+RCS file: /cvs/util/automation/packimages/makefile.mk,v
+retrieving revision 1.12
+diff -u -r1.12 makefile.mk
+--- automation/packimages/makefile.mk	11 Apr 2008 09:53:44 -0000	1.12
++++ automation/packimages/makefile.mk	13 Aug 2008 12:23:42 -0000
+@@ -53,7 +53,7 @@
+ #common_outdir = common
+ #solarresdir = j:\so-cwsserv04\gh7\SRC680\wntmsci10\res.m50
+ 
+-
++IMGSRC=$(SOLARVER)
+ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/images_tt.zip .PHONY:
+     @echo ------------------------------
+     @echo Making: $@
+@@ -63,5 +63,5 @@
+     $(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/vcl*.ilst $(MISC) 
+     $(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/sb*.ilst $(MISC) 
+     -$(MKDIR) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))
+-    $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(MISC) -o $@
++    $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(MISC) -o $@
+ 

Modified: trunk/patches/dev300/piece-setup_native.diff
==============================================================================
--- trunk/patches/dev300/piece-setup_native.diff	(original)
+++ trunk/patches/dev300/piece-setup_native.diff	Wed Aug 13 16:17:06 2008
@@ -14,3 +14,22 @@
  PROCESSOUT=$(MISC)$/$(TARGET)
  PROCESSORDIR=$(SOLARBINDIR)
  
+
+
+This simply doesn't build for me ATM - oddness with $(RPM) missing ...
+
+Index: setup_native/prj/build.lst
+===================================================================
+RCS file: /cvs/installation/setup_native/prj/build.lst,v
+retrieving revision 1.26.6.1
+diff -u -r1.26.6.1 build.lst
+--- setup_native/prj/build.lst	31 Jul 2008 18:53:41 -0000	1.26.6.1
++++ setup_native/prj/build.lst	13 Aug 2008 15:10:38 -0000
+@@ -1,7 +1,5 @@
+ pk	setup_native	:	soltools xml2cmp sal officecfg NULL
+ pk  setup_native                                          usr1    - all  sn_mkout NULL
+-pk  setup_native\scripts\source                           nmake   -  u   sn_source NULL
+-pk  setup_native\scripts                                  nmake   -  u   sn_scripts sn_source.u NULL
+ pk  setup_native\source\win32\customactions\tools         nmake   -  w   sn_tools NULL
+ pk  setup_native\source\win32\customactions\relnotes      nmake   -  w   sn_relnotes NULL
+ pk  setup_native\source\win32\customactions\regactivex    nmake   -  w   sn_regactivex NULL

Modified: trunk/patches/dev300/redirect-extensions.diff
==============================================================================
--- trunk/patches/dev300/redirect-extensions.diff	(original)
+++ trunk/patches/dev300/redirect-extensions.diff	Wed Aug 13 16:17:06 2008
@@ -46,3 +46,62 @@
      </prop>
    </node>
  </oor:component-data> 
+
+Index: sfx2/source/appl/appserv.cxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/appl/appserv.cxx,v
+retrieving revision 1.77
+diff -u -p -r1.77 appserv.cxx
+--- sfx2/source/appl/appserv.cxx	20 Jun 2008 07:11:31 -0000	1.77
++++ sfx2/source/appl/appserv.cxx	13 Aug 2008 15:55:48 -0000
+@@ -841,7 +871,7 @@ void SfxApplication::OfaExec_Impl( SfxRe
+                     xSMGR->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ),
+                     uno::UNO_QUERY_THROW );
+                 if ( xSystemShell.is() )
+-                    xSystemShell->execute( DEFINE_CONST_UNICODE("http://extensions.services.openoffice.org/taxonomy/term/88";), ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS );
++                    xSystemShell->execute( DEFINE_CONST_UNICODE("http://extensions.go-oo.org/taxonomy/term/88";), ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS );
+             }
+             catch( const ::com::sun::star::uno::Exception& )
+             {
+
+Index: svx/source/options/optlingu.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/options/optlingu.cxx,v
+retrieving revision 1.67
+diff -u -p -r1.67 optlingu.cxx
+--- svx/source/options/optlingu.cxx	4 Jun 2008 11:22:37 -0000	1.67
++++ svx/source/options/optlingu.cxx	13 Aug 2008 15:57:18 -0000
+@@ -1115,7 +1115,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window
+     aLinguOptionsCLB.SetDoubleClickHdl(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl));
+ 
+     aMoreDictsLink.SetURL( String(
+-        RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/taxonomy/term/88"; ) ) );
++        RTL_CONSTASCII_STRINGPARAM( "http://extensions.go-oo.org/taxonomy/term/88"; ) ) );
+     aMoreDictsLink.SetClickHdl( LINK( this, SvxLinguTabPage, OpenURLHdl_Impl ) );
+ 
+     xProp = uno::Reference< XPropertySet >( SvxGetLinguPropertySet(), UNO_QUERY );
+@@ -2006,7 +2006,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Win
+     aPrioDownPB.Enable( FALSE );
+ 
+     aMoreDictsLink.SetURL( String(
+-        RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/taxonomy/term/88"; ) ) );
++        RTL_CONSTASCII_STRINGPARAM( "http://extensions.go-oo.org/taxonomy/term/88"; ) ) );
+     aMoreDictsLink.SetClickHdl( LINK( this, SvxEditModulesDlg, OpenURLHdl_Impl ) );
+ 
+     //
+Index: svtools/source/contnr/templwin.cxx
+===================================================================
+RCS file: /cvs/util/svtools/source/contnr/templwin.cxx,v
+retrieving revision 1.82
+diff -u -p -r1.82 templwin.cxx
+--- svtools/source/contnr/templwin.cxx	4 Jun 2008 10:50:40 -0000	1.82
++++ svtools/source/contnr/templwin.cxx	13 Aug 2008 15:58:57 -0000
+@@ -1732,7 +1738,7 @@ void SvtDocumentTemplateDialog::InitImpl
+ 	pImpl->aTitle = GetText();
+ 
+     aMoreTemplatesLink.SetURL( String(
+-        RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/taxonomy/term/36"; ) ) );
++        RTL_CONSTASCII_STRINGPARAM( "http://extensions.go-oo.org/taxonomy/term/36"; ) ) );
+     aMoreTemplatesLink.SetClickHdl( LINK( this, SvtDocumentTemplateDialog, OpenLinkHdl_Impl ) );
+ 
+     aManageBtn.SetClickHdl( LINK( this, SvtDocumentTemplateDialog, OrganizerHdl_Impl ) );
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]