dev/null |binary external/gcc3_specific/makefile.mk | 4 -- instsetoo_native/util/makefile.mk | 9 ---- postprocess/packcomponents/makefile.mk | 4 -- scp2/source/ooo/file_improvement.scp | 41 -------------------- scp2/source/ooo/file_ooo.scp | 10 ----- scp2/source/ooo/makefile.mk | 6 --- scp2/source/ooo/module_hidden_ooo.scp | 12 ------ scp2/source/ooo/module_improvement.scp | 42 --------------------- scp2/source/ooo/ooo_brand.scp | 4 -- scp2/source/ooo/scpaction_ooo.scp | 4 -- scp2/source/ooo/vc_redist.scp | 8 ---- scp2/util/makefile.mk | 4 -- setup_native/prj/d.lst | 1 setup_native/source/win32/msi-encodinglist.txt | 2 - solenv/bin/modules/installer/languages.pm | 45 ----------------------- solenv/bin/modules/installer/scriptitems.pm | 2 - solenv/bin/modules/installer/ziplist.pm | 7 --- solenv/inc/rules.mk | 33 ---------------- solenv/inc/settings.mk | 10 ----- testautomation/global/system/includes/master.inc | 2 - 21 files changed, 3 insertions(+), 247 deletions(-)
New commits: commit e34c87ce752e26426e76602dbeaded704b3587a2 Author: Andras Timar <ati...@suse.com> Date: Wed Sep 28 13:02:32 2011 +0200 Uyghur LCID is 1152 not 2200 diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt index 6e95e4c..ed21cac 100644 --- a/setup_native/source/win32/msi-encodinglist.txt +++ b/setup_native/source/win32/msi-encodinglist.txt @@ -136,7 +136,7 @@ tr 1254 1055 # Turkish ts 0 1073 # Tsonga tk 0 1090 tt 1251 1092 # Tatar -ug 0 2200 +ug 0 1152 uk 1251 1058 # Ukrainian ur 1256 1056 # Urdu ur-IN 0 2080 commit 5e61a194f1c5da0152b132b1fd182426c8b7afaa Author: Andras Timar <ati...@suse.com> Date: Wed Sep 28 10:52:58 2011 +0200 remove obsolete fake_languagesstring() subroutine diff --git a/solenv/bin/modules/installer/languages.pm b/solenv/bin/modules/installer/languages.pm index 8f0b6e9..8c7fc7e 100644 --- a/solenv/bin/modules/installer/languages.pm +++ b/solenv/bin/modules/installer/languages.pm @@ -171,51 +171,6 @@ sub get_all_languages_for_one_product return \@languagearray; } -#################################################################################### -# FAKE: The languages string may contain only "de", "en-US", instead of "01", ... -# But this has to be removed as soon as possible. -# In the future the languages are determined with "en-US" instead "01" -# already on the command line and in the zip list file. -#################################################################################### - -sub fake_languagesstring -{ - my ($stringref) = @_; - - # ATTENTION: This function has to be removed as soon as possible! - - $$stringref =~ s/01/en-US/; - $$stringref =~ s/03/pt/; - $$stringref =~ s/07/ru/; - $$stringref =~ s/30/el/; - $$stringref =~ s/31/nl/; - $$stringref =~ s/33/fr/; - $$stringref =~ s/34/es/; - $$stringref =~ s/35/fi/; - $$stringref =~ s/36/hu/; - $$stringref =~ s/37/ca/; - $$stringref =~ s/39/it/; - $$stringref =~ s/42/cs/; - $$stringref =~ s/43/sk/; - $$stringref =~ s/44/en-GB/; - $$stringref =~ s/45/da/; - $$stringref =~ s/46/sv/; - $$stringref =~ s/47/no/; - $$stringref =~ s/48/pl/; - $$stringref =~ s/49/de/; - $$stringref =~ s/55/pt-BR/; - $$stringref =~ s/66/th/; - $$stringref =~ s/77/et/; - $$stringref =~ s/81/ja/; - $$stringref =~ s/82/ko/; - $$stringref =~ s/86/zh-CN/; - $$stringref =~ s/88/zh-TW/; - $$stringref =~ s/90/tr/; - $$stringref =~ s/91/hi-IN/; - $$stringref =~ s/96/ar/; - $$stringref =~ s/97/he/; -} - ########################################################## # Converting the language array into a string for output ########################################################## diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 34f16ec..9189b10 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -783,8 +783,6 @@ sub replace_setup_variables my $languagesstring = $$languagestringref; $languagesstring =~ s/\_/ /g; # replacing underscore with whitespace - # $languagesstring is "01 49" instead of "en-US de" - installer::languages::fake_languagesstring(\$languagesstring); my $productname = $hashref->{'PRODUCTNAME'}; my $productversion = $hashref->{'PRODUCTVERSION'}; commit 05293cb04c707b12047ce2378894cf6b7bb67bbc Author: Andras Timar <ati...@suse.com> Date: Tue Sep 27 21:33:07 2011 +0200 remove checks for unused BUILD_SPECIAL environment variable diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk index 5d0fef8..fd45273 100644 --- a/external/gcc3_specific/makefile.mk +++ b/external/gcc3_specific/makefile.mk @@ -7,8 +7,6 @@ TARGET=gcc3_specific # ------------------------------------------------------------------ -.IF "$(BUILD_SPECIAL)"=="" - .IF "$(GUI)" == "WNT" .IF "$(COM)" == "GCC" @@ -84,8 +82,6 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) : .ENDIF .ENDIF -.ENDIF # "$(BUILD_SPECIAL)"=="" - .INCLUDE: target.mk diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index d2878c3..b2cc69e 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -183,13 +183,6 @@ MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates -.IF "$(BUILD_SPECIAL)"!="" -MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE) -MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE) -MSIHELPPACKTEMPLATEDIR=$(MSIHELPPACKTEMPLATESOURCE) -MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE) -MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE) -.ELSE # "$(BUILD_SPECIAL)"!="" NOLOGOSPLASH:=$(BIN)$/intro.zip DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates @@ -236,8 +229,6 @@ $(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i) : $(ADDDEPS) $(MAKETARGETS) : $(ADDDEPS) .ENDIF # "$(MAKETARGETS)"!="" -.ENDIF # "$(BUILD_SPECIAL)"!="" - $(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")} .IF "$(MAKETARGETS)"!="" .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)" diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 639aa7c..8f23fc4 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -201,10 +201,6 @@ my_components += pythonloader my_components += component/desktop/unx/splash/splash .ENDIF -.IF "$(BUILD_SPECIAL)" != "" -my_components += oooimprovement -.END - .IF "$(DISABLE_ATL)" == "" my_components += emboleobj .END diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp deleted file mode 100644 index cd6cfe7..0000000 --- a/scp2/source/ooo/file_improvement.scp +++ /dev/null @@ -1,41 +0,0 @@ -/************************************************************************* -* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * -************************************************************************/ - -#include "macros.inc" - -#if defined(BUILD_SPECIAL) -File gid_File_Share_Registry_Oooimprovement_Xcd - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry; - Name = "oooimprovement.xcd"; -End -#endif - -#if defined(BUILD_SPECIAL) -STD_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement) -#endif diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index f5b30d9..6c7bcb7 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -2156,13 +2156,3 @@ File gid_File_Extension_Dictionary_Zu UnixRights = 444; End #endif - -// #ifdef BUILD_SPECIAL -// File gid_File_Extension_Oxt_Oooimprovement -// Name = "OOoImprovement.oxt"; -// Dir = gid_Brand_Dir_Share_Extensions_Oooimprovement; -// Styles = (PACKED, ARCHIVE); -// UnixRights = 444; -// End -// #endif - diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 76fbc52..391348a 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -41,10 +41,6 @@ TARGETTYPE=CUI SCPDEFS+=-D_MSC .ENDIF -.IF "$(BUILD_SPECIAL)"!="" -SCPDEFS+=-DBUILD_SPECIAL -.ENDIF - .IF "$(ENABLE_ONLINE_UPDATE)"!="" SCPDEFS+=-DENABLE_ONLINE_UPDATE .ENDIF @@ -308,7 +304,6 @@ PARFILES= \ file_font_ooo.par \ file_library_ooo.par \ file_resource_ooo.par \ - file_improvement.par \ shortcut_ooo.par \ module_ooo.par \ module_hidden_ooo.par \ @@ -318,7 +313,6 @@ PARFILES= \ module_help_template.par \ module_java.par \ module_systemint.par \ - module_improvement.par \ profile_ooo.par \ profileitem_ooo.par \ ure.par \ diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index cb1e89a..c290f2b 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -868,15 +868,3 @@ Module gid_Module_Root_Userland PackageName = "${USERLANDPACKAGENAME}"; End #endif - -// #ifdef BUILD_SPECIAL -// Module gid_Module_Root_Extension_Oooimprovement -// Name = "gid_Module_Root_Extension_Oooimprovement"; -// Description = "gid_Module_Root_Extension_Oooimprovement"; -// Files = (gid_File_Extension_Oxt_Oooimprovement); -// InstallOrder = "1990"; -// PackageInfo = "packinfo_office.txt"; -// ParentID = gid_Module_Root; -// Styles = (HIDDEN_ROOT); -// End -// #endif diff --git a/scp2/source/ooo/module_improvement.scp b/scp2/source/ooo/module_improvement.scp deleted file mode 100644 index 1380202..0000000 --- a/scp2/source/ooo/module_improvement.scp +++ /dev/null @@ -1,42 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.inc" - -// OOo improvement module - -#if defined(BUILD_SPECIAL) -Module gid_Module_Oooimprovement - PackageInfo = "packinfo_office.txt"; - Name = "gid_Module_Oooimprovement"; - Description = "gid_Module_Oooimprovement"; - ParentID = gid_Module_Root; - Default = YES; - Styles = (HIDDEN_ROOT); - Files = (gid_File_Share_Registry_Oooimprovement_Xcd, gid_File_Lib_Oooimprovement); -End -#endif diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp index dcdf99b..649c6b6 100644 --- a/scp2/source/ooo/ooo_brand.scp +++ b/scp2/source/ooo/ooo_brand.scp @@ -52,10 +52,6 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server Section = "ErrorReport"; Order = 8; Key = "ErrorReportServer"; - #if defined(BUILD_SPECIAL) Value = "report.libreoffice.org"; - #else - Value = ""; - #endif End diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index 13a1316..dba0ce7 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -282,11 +282,7 @@ End #ifdef MACOSX ScpAction scp_Copy_Dmg_Background_Image - #if defined(BUILD_SPECIAL) Copy = "osxdndinstall.png"; - #else - Copy = "osxdndinstall_nologo.png"; - #endif Name = "background.png"; UnixRights = 444; Styles = (); diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 0b71511..5c5c557 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -30,21 +30,13 @@ #if defined(WITH_VC_REDIST) ScpAction scp_Copy_vcredist_x86 - #if defined(BUILD_SPECIAL) - Copy = "vcredist_x86_9.0.30729.4148.exe"; - #else Copy = "vcredist_x86.exe"; - #endif Name = "vcredist_x86.exe"; Subdir = "redist"; End ScpAction scp_Copy_vcredist_x64 - #if defined(BUILD_SPECIAL) - Copy = "vcredist_x64_9.0.30729.4148.exe"; - #else Copy = "vcredist_x64.exe"; - #endif Name = "vcredist_x64.exe"; Subdir = "redist"; End diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index adc03b7..5b611c3 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -111,8 +111,6 @@ SCP1FILES += \ SCP1FILES += \ ure_into_ooo.par \ ure.par \ - module_improvement.par \ - file_improvement.par \ common_brand.par \ common_brand_readme.par \ ooo_brand.par @@ -305,8 +303,6 @@ SCP2FILES += \ SCP2FILES += \ ure_into_ooo.par \ ure.par \ - module_improvement.par \ - file_improvement.par \ common_brand.par \ common_brand_readme.par \ ooo_brand.par diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst index ed5abf6..71290f1 100644 --- a/setup_native/prj/d.lst +++ b/setup_native/prj/d.lst @@ -30,7 +30,6 @@ mkdir: %_DEST%\bin\osolsmf ..\source\mac\*.icns %_DEST%\bin\*.icns ..\source\mac\Info.plist.langpack %_DEST%\bin\Info.plist.langpack ..\source\mac\ooo\osxdndinstall.png %_DEST%\bin\osl\osxdndinstall.png -..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin\osl\osxdndinstall_nologo.png ..\source\mac\ooo\DS_Store %_DEST%\bin\osl\DS_Store ..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin\osl\DS_Store_Langpack ..\source\java\javaversion.dat %_DEST%\bin\javaversion.dat diff --git a/setup_native/source/mac/ooo/osxdndinstall_nologo.png b/setup_native/source/mac/ooo/osxdndinstall_nologo.png deleted file mode 100644 index 2ce08fe..0000000 Binary files a/setup_native/source/mac/ooo/osxdndinstall_nologo.png and /dev/null differ diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index b322b9e..a820cd9 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -668,13 +668,6 @@ sub set_default_productversion_if_required { $allvariables->{'PRODUCTVERSION'} = 1; # FAKE } - - # Creating differentiators for BUILD_SPECIAL in layering - if ( ! $ENV{'BUILD_SPECIAL'} ) - { - if ( $allvariables->{'REGISTRYLAYERNAME'} ) { $allvariables->{'REGISTRYLAYERNAME'} = $allvariables->{'REGISTRYLAYERNAME'} . "_"; } - if (( $installer::globals::iswindowsbuild ) && ( $allvariables->{'BASISROOTNAME'} )) { $allvariables->{'BASISROOTNAME'} = $allvariables->{'BASISROOTNAME'} . "_"; } - } } #################################################### diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index ca816d8..cc2d8df 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -92,31 +92,13 @@ $(OBJ)/%.obj : %.cc .ENDIF .IF "$(ENABLE_PCH)"!="" -# workaround for file locking problems on network volumes -.IF "$(NETWORK_BUILD)"=="" PCHOUTDIR=$(SLO)/pch PCHEXOUTDIR=$(SLO)/pch_ex -.ELSE # "$(NETWORK_BUILD)"=="" -PCHOUTDIR=$(TMP)/$(BUILD)$(PRJNAME)$(PROEXT) -PCHEXOUTDIR=$(TMP)/$(BUILD)$(PRJNAME)_ex$(PROEXT) -.ENDIF # "$(NETWORK_BUILD)"=="" + $(SLO)/precompiled.% .PHONY: -$(MKDIRHIER) $(SLO)/pch .IF "$(COM)"=="MSC" -.IF "$(NETWORK_BUILD)"!="" - -$(MKDIRHIER) $(PCHOUTDIR) -.IF "$(HAVE_BIG_TMP)"=="" - $(COMMAND_ECHO)-$(COPY) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) -.ENDIF # "$(HAVE_BIG_TMP)"=="" -.ENDIF # "$(NETWORK_BUILD)"!="" $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx) -.IF "$(NETWORK_BUILD)"!="" - $(COMMAND_ECHO)$(COPY) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -.IF "$(HAVE_BIG_TMP)"=="" - $(COMMAND_ECHO)$(RM) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) - $(COMMAND_ECHO)$(RMDIR) $(PCHOUTDIR) -.ENDIF # "$(HAVE_BIG_TMP)"=="" -.ENDIF # "$(NETWORK_BUILD)"!="" .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000" $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch/precompiled_$(PRJNAME).hxx @@ -128,20 +110,7 @@ $(SLO)/precompiled.% .PHONY: $(SLO)/precompiled_ex.% .PHONY: -$(MKDIRHIER) $(SLO)/pch_ex .IF "$(COM)"=="MSC" -.IF "$(NETWORK_BUILD)"!="" - -$(MKDIRHIER) $(PCHEXOUTDIR) -.IF "$(HAVE_BIG_TMP)"=="" - $(COMMAND_ECHO)-$(COPY) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) -.ENDIF # "$(HAVE_BIG_TMP)"=="" -.ENDIF # "$(NETWORK_BUILD)"!="" $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx) -.IF "$(NETWORK_BUILD)"!="" - $(COMMAND_ECHO)$(COPY) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -.IF "$(HAVE_BIG_TMP)"=="" - $(COMMAND_ECHO)$(RM) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) - $(COMMAND_ECHO)$(RMDIR) $(PCHEXOUTDIR) -.ENDIF # "$(HAVE_BIG_TMP)"=="" -.ENDIF # "$(NETWORK_BUILD)"!="" .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000" $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 661861b..6030f13 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -42,12 +42,6 @@ force_dmake_to_error ENABLE_PCH=TRUE .ENDIF # "$(USE_PCH)"!="" -.IF "$(ENABLE_PCH)"!="" && "$(BUILD_SPECIAL)"!="" -.IF "$(SOLARSRC)"=="$(SRC_ROOT)" -NETWORK_BUILD:=TRUE -.ENDIF # "$(SOLARSRC)"=="$(SRC_ROOT)" -.ENDIF # "$(ENABLE_PCH)"!="" && "$(BUILD_SPECIAL)"!="" - .INCLUDE : unitools.mk .INCLUDE : minor.mk @@ -973,10 +967,6 @@ RSCUPDVERDEF=-DUPDVER="$(RSCUPDVER)" RSCFLAGS=-s RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) $(JAVADEF) -.IF "$(BUILD_SPECIAL)"!="" -RSCDEFS+=-DBUILD_SPECIAL=$(BUILD_SPECIAL) -.ENDIF - RSCDEFIMG*=default_images RSCEXTINC=. diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc index 22c7e62..7fa22ba 100644 --- a/testautomation/global/system/includes/master.inc +++ b/testautomation/global/system/includes/master.inc @@ -798,7 +798,7 @@ sub mMakeGeneralOptionsAPI gAutoUpdate = FALSE endcatch - '///+ OOo Improvement - only if BUILD_SPECIAL is set we have this file created. + '///+ OOo Improvement - currently not used in LibreOffice sTempPath = gOfficeBasisPath & "share/registry/oooimprovement.xcd" sTempPath = ConvertPath( sTempPath ) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits