GNOME.org
 

ooo-build r13266 - in trunk: . patches/dev300

Author: szalaik
Date: Thu Jul 17 10:09:55 2008
New Revision: 13266
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13266&view=rev

Log:
2008-07-17  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/ooop-win32-installer-branding.diff
	Fixed branding related diff problem for dev300-m25.
	* patches/dev300/win32-prebuilt-writingaids-zip.diff
	Adjusted patches to apply on dev300-m25.
	* patches/dev300/scp2_build_accessories.diff
	Small fix that breaked OxygenOffice's build



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/ooop-win32-installer-branding.diff
   trunk/patches/dev300/scp2_build_accessories.diff
   trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff

Modified: trunk/patches/dev300/ooop-win32-installer-branding.diff
==============================================================================
--- trunk/patches/dev300/ooop-win32-installer-branding.diff	(original)
+++ trunk/patches/dev300/ooop-win32-installer-branding.diff	Thu Jul 17 10:09:55 2008
@@ -11,15 +11,15 @@
  en-US = "&Next >"
 --- instsetoo_native/util/makefile.mk.old	2006-01-16 15:10:22.000000000 +0200
 +++ instsetoo_native/util/makefile.mk	2006-01-17 12:58:26.000000000 +0200
-@@ -372,10 +372,17 @@
+@@ -372,9 +372,17 @@
  	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
  	$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
- 	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+# 	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
 -	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
 -	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
 -	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
 -	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
--	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+-#	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
 +	$(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
 +	$(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
 +	$(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
@@ -32,9 +32,10 @@
 +	$(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
 +	$(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
 +	$(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
- 
- 
-dummy line to avoid confusing diff-mode
++
+
+
+
 --- instsetoo_native/util/openoffice.lst.old	2006-01-17 12:23:31.000000000 +0200
 +++ instsetoo_native/util/openoffice.lst	2006-01-17 14:24:08.000000000 +0200
 @@ -29,9 +29,9 @@

Modified: trunk/patches/dev300/scp2_build_accessories.diff
==============================================================================
--- trunk/patches/dev300/scp2_build_accessories.diff	(original)
+++ trunk/patches/dev300/scp2_build_accessories.diff	Thu Jul 17 10:09:55 2008
@@ -6,5 +6,5 @@
  cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
 -cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
 +cp    scp2\source\accessories     nmake    -    all    cp_accessories cp_langmacros NULL
-+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
++cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
 

Modified: trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff
==============================================================================
--- trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff	(original)
+++ trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff	Thu Jul 17 10:09:55 2008
@@ -1,36 +1,34 @@
 --- dictionaries/prj/build.lst
 +++ dictionaries/prj/build.lst
-@@ -1,30 +1,3 @@
+@@ -1,28 +1,3 @@
 -di      dictionaries :       lingucomponent hyphen NULL
 -di	dictionaries					usr1 - all di_mkout NULL
--di	dictionaries\diclst	nmake	-	all	di_diclst NULL
--di	dictionaries\af_ZA	nmake	-	all	di_af_ZA di_diclst NULL
--di	dictionaries\cs_CZ	nmake	-	all	di_cs_CZ di_diclst NULL
--di	dictionaries\da_DK	nmake	-	all	di_da_DK di_diclst NULL
--di	dictionaries\de_DE	nmake	-	all	di_de_DE di_diclst NULL
--di	dictionaries\de_CH	nmake	-	all	di_de_CH di_diclst NULL
--di	dictionaries\de_AT	nmake	-	all	di_de_AT di_diclst NULL
--di	dictionaries\en_GB	nmake	-	all	di_en_GB di_en_US di_diclst NULL
--di	dictionaries\en_US	nmake	-	all	di_en_US di_diclst NULL
--di	dictionaries\en_ZA	nmake	-	all	di_en_ZA di_diclst NULL
--di	dictionaries\es_ES	nmake	-	all	di_es_ES di_diclst NULL
--di	dictionaries\et_EE	nmake	-	all	di_et_EE di_diclst NULL
--di	dictionaries\fr_FR	nmake	-	all	di_fr_FR di_diclst NULL
--di	dictionaries\hu_HU	nmake	-	all	di_hu_HU di_diclst NULL
--di	dictionaries\it_IT	nmake	-	all	di_it_IT di_diclst NULL
--di	dictionaries\lt_LT	nmake	-	all	di_lt_LT di_diclst NULL
--di	dictionaries\ne_NP	nmake	-	all	di_ne_NP di_diclst NULL
--di	dictionaries\nl_NL	nmake	-	all	di_nl_NL di_diclst NULL
--di      dictionaries\pl_PL      nmake   -       all     di_pl_PL di_diclst NULL
--di      dictionaries\pt_BR      nmake   -       all     di_pt_BR di_diclst NULL
--di	dictionaries\ru_RU	nmake	-	all	di_ru_RU di_diclst NULL
--di      dictionaries\th_TH      nmake   -       all     di_th_TH di_diclst NULL
--di      dictionaries\sk_SK      nmake   -       all     di_sk_SK di_diclst NULL
--di	dictionaries\sl_SI	nmake	-	all	di_sl_SI di_diclst NULL
--di      dictionaries\sv_SE      nmake   -       all     di_sv_SE di_diclst NULL
--di      dictionaries\sw_TZ      nmake   -       all     di_sw_TZ di_diclst NULL
--di      dictionaries\zu_ZA      nmake   -       all     di_zu_ZA di_diclst NULL
--di      dictionaries\util       nmake   -       all     di_util di_af_ZA di_cs_CZ di_da_DK di_de_DE di_de_CH di_de_AT di_en_GB di_en_US di_en_ZA di_es_ES di_et_EE di_fr_FR di_hu_HU di_it_IT di_lt_LT di_ne_NP di_nl_NL di_pl_PL di_pt_BR di_ru_RU di_th_TH di_sk_SK di_sl_SI di_sv_SE di_sw_TZ di_zu_ZA di_diclst NULL
+-di      dictionaries\af_ZA      nmake   -       all     di_af_ZA NULL
+-di      dictionaries\cs_CZ      nmake   -       all     di_cs_CZ NULL
+-di      dictionaries\da_DK      nmake   -       all     di_da_DK NULL
+-di      dictionaries\de_AT      nmake   -       all     di_de_AT NULL
+-di      dictionaries\de_CH      nmake   -       all     di_de_CH NULL
+-di      dictionaries\de_DE      nmake   -       all     di_de_DE di_de_AT di_de_CH NULL
+-di      dictionaries\en_US      nmake   -       all     di_en_US NULL
+-di      dictionaries\en_ZA      nmake   -       all     di_en_ZA NULL
+-di      dictionaries\en_GB      nmake   -       all     di_en_GB di_en_US di_en_ZA NULL
+-di      dictionaries\es_ES      nmake   -       all     di_es_ES NULL
+-di      dictionaries\et_EE      nmake   -       all     di_et_EE NULL
+-di      dictionaries\fr_FR      nmake   -       all     di_fr_FR NULL
+-di      dictionaries\hu_HU      nmake   -       all     di_hu_HU NULL
+-di      dictionaries\it_IT      nmake   -       all     di_it_IT NULL
+-di      dictionaries\lt_LT      nmake   -       all     di_lt_LT NULL
+-di      dictionaries\ne_NP      nmake   -       all     di_ne_NP NULL
+-di      dictionaries\nl_NL      nmake   -       all     di_nl_NL NULL
+-di      dictionaries\pl_PL      nmake   -       all     di_pl_PL NULL
+-di      dictionaries\pt_BR      nmake   -       all     di_pt_BR NULL
+-di      dictionaries\ru_RU      nmake   -       all     di_ru_RU NULL
+-di      dictionaries\th_TH      nmake   -       all     di_th_TH NULL
+-di      dictionaries\sk_SK      nmake   -       all     di_sk_SK NULL
+-di      dictionaries\sl_SI      nmake   -       all     di_sl_SI NULL
+-di      dictionaries\sv_SE      nmake   -       all     di_sv_SE NULL
+-di      dictionaries\sw_TZ      nmake   -       all     di_sw_TZ NULL
+-di      dictionaries\zu_ZA      nmake   -       all     di_zu_ZA NULL
 +di      dictionaries :       NULL
 +di	dictionaries					usr1 - all di_mkout NULL
 +di	dictionaries\prebuilt	nmake	-	all	di_diclst NULL
@@ -38,7 +36,7 @@
 +++ dictionaries/prj/d.lst
 @@ -1,2 +1,2 @@
  mkdir: %_DEST%\pck%_EXT%
--..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+-..\%__SRC%\bin\*.oxt %_DEST%\pck%_EXT%\*.oxt
 +..\prebuilt\writingaids.zip             %_DEST%\pck%_EXT%\writingaids.zip
 --- dictionaries/prebuilt/makefile.mk
 +++ dictionaries/prebuilt/makefile.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]