Skip to content

C
core
Kaydet (Commit) f115ddb6 authored tarafından Petr Mladek's avatar Petr Mladek
Dosyalara gözat
Seçenekler

Merge remote-tracking branch 'origin/libreoffice-3-4'

üst 0a2923d0 468ba5cf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 413 additions and 58 deletions
configure.in
Dosyayı görüntüle @ f115ddb6
......@@ -577,6 +577,13 @@ AC_ARG_WITH(afms,
are known to be available.]),
,)
AC_ARG_WITH(agfa-monotype-fonts,
AS_HELP_STRING([--with-agfa-monotype-fonts],
[Do not include the proprietary Agfa Monotype fonts
(even if present) in the LibreOffice installation
set.])
,)
AC_ARG_WITH(epm,
AS_HELP_STRING([--with-epm],
[Decides which epm to use. Default is to use the one from the system if
......@@ -1437,7 +1444,7 @@ case "$host_os" in
test_cups=no
_os=GNU
;;
cygwin*) # Windows
cygwin*|interix*) # Windows
test_cups=no
test_randr=no
test_freetype=no
......@@ -4189,6 +4196,9 @@ dnl Check for system translate-toolkit
dnl ===================================================================
AC_MSG_CHECKING([which translate-toolkit to use])
if test "$with_system_translate_toolkit" = "yes" ; then
AC_MSG_RESULT([system])
SYSTEM_TRANSLATE_TOOLKIT=YES
AC_PATH_PROGS(OO2PO, oo2po)
if test -z "$OO2PO"; then
AC_MSG_ERROR([install translate-toolkit or use --without-system-translate-toolkit])
......@@ -4198,9 +4208,11 @@ if test "$with_system_translate_toolkit" = "yes" ; then
if test -z "$PO2OO"; then
AC_MSG_ERROR([install translate-toolkit or use --without-system-translate-toolkit])
fi
AC_MSG_RESULT([system])
SYSTEM_TRANSLATE_TOOLKIT=YES
$PO2OO --help | grep -q '\-\-skipsource'
if test $? -ne 0 ; then
AC_MSG_ERROR([$PO2OO does not support --skipsource; use translate-toolkit >= 1.9 or use --without-system-translate-toolkit])
fi
else
AC_MSG_RESULT([internal])
SYSTEM_TRANSLATE_TOOLKIT=NO
......@@ -7310,6 +7322,18 @@ else
fi
AC_SUBST(WITH_FONTS)
AC_MSG_CHECKING([whether to include Agfa Monotype fonts])
if test "$with_agfa_monotype_fonts" = "yes" ; then
AC_MSG_RESULT([yes])
WITH_AGFA_MONOTYPE_FONTS=YES
SCPDEFS="$SCPDEFS -DWITH_AGFA_MONOTYPE_FONTS"
BUILD_TYPE="$BUILD_TYPE AGFA_MONOTYPE_FONTS"
else
AC_MSG_RESULT([no])
WITH_AGFA_MONOTYPE_FONTS=NO
fi
AC_SUBST(WITH_AGFA_MONOTYPE_FONTS)
dnl ===================================================================
dnl Test whether to include ppds
dnl ===================================================================
......@@ -7706,6 +7730,17 @@ dnl Dealing with l10n options
dnl ===================================================================
GIT_REPO_NAMES="artwork base calc components extensions extras filters help impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing ure writer"
AC_MSG_CHECKING([which languages to be built])
# get list of all languages
# generate shell variable from completelangiso= from solenv/inc/postset.mk
# the sed command does the following:
# + if a line ends with a backslash, append the next line to it
# + adds " on the beginning of the value (after =)
# + adds " at the end of the value
# + removes en-US; we want to put it on the beginning
# + prints just the section starting with 'completelangiso=' and ending with the " at the end of line
[eval $(sed -e :a -e '/\\$/N; s/\\\n//; ta' -n -e 's/=/="/;s/\([^\\]\)$/\1"/;s/en-US//;/^completelangiso/p' solenv/inc/postset.mk)]
ALL_LANGS="en-US $completelangiso"
# check the configured localizations
WITH_LANG="$with_lang"
if test -z "$WITH_LANG"; then
AC_MSG_RESULT([en-US])
......@@ -7713,6 +7748,15 @@ else
AC_MSG_RESULT([$WITH_LANG])
GIT_REPO_NAMES="$GIT_REPO_NAMES translations"
fi
# check that the list is valid
for lang in $WITH_LANG ; do
test "$lang" = "ALL" && continue;
# need to check for the exact string, so add space before and after the list of all languages
all_langs=" $ALL_LANGS "
test `echo "$all_langs" | sed "s|.* $lang .*|found|"` = "found" && continue;
AC_MSG_ERROR([invalid language: $lang; supported languages are: $ALL_LANGS])
done
AC_SUBST(ALL_LANGS)
AC_SUBST(WITH_LANG)
AC_SUBST(GIT_REPO_NAMES)
......
instsetoo_native/util/makefile.mk
Dosyayı görüntüle @ f115ddb6
......@@ -147,6 +147,14 @@ brofficewithjre: $(foreach,i,$(alllangiso) brofficewithjre_$i)
broolanguagepack : $(foreach,i,$(alllangiso) broolanguagepack_$i)
oxygenoffice: $(foreach,i,$(alllangiso) oxygenoffice_$i)
oxygenofficewithjre: $(foreach,i,$(alllangiso) oxygenofficewithjre_$i)
oxygenofficelanguagepack : $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i)
oxygenofficehelppack : $(foreach,i,$(alllangiso) oxygenofficehelppack_$i)
MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates
......@@ -202,6 +210,14 @@ $(foreach,i,$(alllangiso) brofficewithjre_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) broolanguagepack_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) oxygenoffice_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) oxygenofficehelppack_$i) : $(ADDDEPS)
.IF "$(MAKETARGETS)"!=""
$(MAKETARGETS) : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS)"!=""
......@@ -287,6 +303,29 @@ $(foreach,i,$(alllangiso) broolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
broolanguagepack_%{$(PKGFORMAT:^".")} :
+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
$(foreach,i,$(alllangiso) oxygenoffice_$i) : $$@{$(PKGFORMAT:^".")}
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
.ENDIF # "$(MAKETARGETS)"!=""
oxygenoffice_%{$(PKGFORMAT:^".") .archive} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OxygenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
oxygenofficewithjre_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
oxygenofficelanguagepack_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
$(foreach,i,$(alllangiso) oxygenofficehelppack_$i) : $$@{$(PKGFORMAT:^".")}
oxygenofficehelppack_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
.ELSE # "$(alllangiso)"!=""
openoffice:
@echo cannot pack nothing...
......@@ -295,7 +334,7 @@ openoffice:
.IF "$(DISABLE_PYTHON)" != "TRUE"
.IF "$(LOCALPYFILES)"!=""
$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
.ENDIF # "$(LOCALPYFILES)"!=""
$(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
......
instsetoo_native/util/openoffice.lst
Dosyayı görüntüle @ f115ddb6
......@@ -5,7 +5,7 @@ Globals
variables
{
OOOBASEVERSION 3.4
OOOPACKAGEVERSION 3.4.0
OOOPACKAGEVERSION 3.4.0
UREPACKAGEVERSION 3.4.0
URELAYERVERSION 1
BASISROOTNAME LibreOffice
......@@ -392,3 +392,142 @@ LibreOffice_Dev_SDK
include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
}
}
OxygenOffice
{
Settings
{
variables
{
PRODUCTNAME OxygenOffice
PRODUCTNAME_BR OxygenOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.3.2
BASEPRODUCTVERSION 3.3
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 3.3.2
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
XPDINSTALLER 0
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
LIBRARYVERSION 9.3.0
PATCHCODEFILE ooo_patchcodes.txt
DOWNLOADBANNER ooobanner_ooop.bmp
DOWNLOADBITMAP ooobitmap_ooop.bmp
DOWNLOADBANNER_BR ooobanner_ooop.bmp
DOWNLOADBITMAP_BR ooobitmap_ooop.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
STARTCENTER_INFO_URL http://www.libreoffice.org/
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
STARTCENTER_LAYOUT_STYLE 0
REGISTRATION_PRODUCT OxygenOffice
REGISTRATION_CID 926117
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
}
active 1
compression 5
script setup_osl
downloadname OOOP_{productversion}_{os}_install_{languages}
langpackdownloadname OOOP_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname OOOP_{productversion}_helppack_{os}_install_{languages}
include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
}
}
OxygenOffice_wJRE
{
Settings
{
variables
{
PRODUCTNAME OxygenOffice
PRODUCTNAME_BR OxygenOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.3.2
BASEPRODUCTVERSION 3.3
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 3.3.2
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
WITHJREPRODUCT 1
GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
XPDINSTALLER 1
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
LIBRARYVERSION 9.3.0
PATCHCODEFILE ooo_patchcodes.txt
JAVAPRODUCT 1
DOWNLOADBANNER ooobanner_ooop.bmp
DOWNLOADBITMAP ooobitmap_ooop.bmp
DOWNLOADBANNER_BR ooobanner_ooop.bmp
DOWNLOADBITMAP_BR ooobitmap_ooop.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
STARTCENTER_INFO_URL http://www.libreoffice.org/
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
STARTCENTER_LAYOUT_STYLE 0
REGISTRATION_PRODUCT OxygenOffice
REGISTRATION_CID 926117
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
}
active 1
compression 5
script setup_osljre
downloadname OOOP_{productversion}_{os}_installwjre_{languages}
langpackdownloadname OOOP_{productversion}_languagepack_{os}_installwjre_{languages}
helppackdownloadname OOOP_{productversion}_helppack_{os}_installwjre_{languages}
include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
}
}
scp2/source/accessories/module_font_accessories.scp
Dosyayı görüntüle @ f115ddb6
......@@ -126,40 +126,40 @@ Module gid_Module_Optional_Accessories_Fonts
gid_File_Fnt_zektonbi,
gid_File_Fnt_zektonit,
gid_File_Fnt_zorque,
gid_File_Fnt_-URW-Gothic_L_Avantgarde,
gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde,
gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde,
gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde,
gid_File_Fnt_-URW-Bookman_L_Bookman,
gid_File_Fnt_-URW-Bookman_L_Bold_Bookman,
gid_File_Fnt_-URW-Bookman_L_Italic_Bookman,
gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman,
gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook,
gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook,
gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook,
gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook,
gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica,
gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica,
gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica,
gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica,
gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed,
gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed,
gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed,
gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed,
gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times,
gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times,
gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times,
gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times,
gid_File_Fnt_-URW-Nimbus_Mono_L_Courier,
gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier,
gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier,
gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier,
gid_File_Fnt_-URW-Palladio_L_Palitino,
gid_File_Fnt_-URW-Palladio_L_Bold_Palitino,
gid_File_Fnt_-URW-Palladio_L_Italic_Palitino,
gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino,
gid_File_Fnt_-URW-Standard_Symbols_L_Symbol,
gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery,
gid_File_Fnt_URW_Gothic_L_Avantgarde,
gid_File_Fnt_URW_Gothic_L_Bold_Avantgarde,
gid_File_Fnt_URW_Gothic_L_Italic_Avantgarde,
gid_File_Fnt_URW_Gothic_L_Bold_Italic_Avantgarde,
gid_File_Fnt_URW_Bookman_L_Bookman,
gid_File_Fnt_URW_Bookman_L_Bold_Bookman,
gid_File_Fnt_URW_Bookman_L_Italic_Bookman,
gid_File_Fnt_URW_Bookman_L_Bold_Italic_Bookman,
gid_File_Fnt_URW_Century_Schoolbook_L_New_Century_SchoolBook,
gid_File_Fnt_URW_Century_Schoolbook_L_Bold_New_Century_SchoolBook,
gid_File_Fnt_URW_Century_Schoolbook_L_Italic_New_Century_SchoolBook,
gid_File_Fnt_URW_Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook,
gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica,
gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica,
gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica,
gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica,
gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica_Condensed,
gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica_Condensed,
gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica_Condensed,
gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed,
gid_File_Fnt_URW_Nimbus_Roman_No9_L_Times,
gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Times,
gid_File_Fnt_URW_Nimbus_Roman_No9_L_Italic_Times,
gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Italic_Times,
gid_File_Fnt_URW_Nimbus_Mono_L_Courier,
gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Courier,
gid_File_Fnt_URW_Nimbus_Mono_LK_Italic_Courier,
gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Italic_Courier,
gid_File_Fnt_URW_Palladio_L_Palitino,
gid_File_Fnt_URW_Palladio_L_Bold_Palitino,
gid_File_Fnt_URW_Palladio_L_Italic_Palitino,
gid_File_Fnt_URW_Palladio_L_Bold_Italic_Palitino,
gid_File_Fnt_URW_Standard_Symbols_L_Symbol,
gid_File_Fnt_URW_Chancery_L_Zapf_Chancery,
gid_File_Fnt_Dingbats,
gid_File_Fnt_Luxi_Mono_Bold,
gid_File_Fnt_Luxi_Mono_Bold_Oblique,
......
scp2/source/ooo/common_brand.scp
Dosyayı görüntüle @ f115ddb6
......@@ -1197,6 +1197,24 @@ ProfileItem gid_Brand_Profileitem_Version_Useragent
Value = "<PRODUCT> (${buildid}; ${_OS}; ${_ARCH}; BundledLanguages=${AllLanguages})";
End
ProfileItem gid_Brand_Profileitem_Version_Vendor
ProfileID = gid_Brand_Profile_Version_Ini;
ModuleID = gid_Module_Root_Brand;
Section = "Version";
Order = 16;
Key = "Vendor";
Value = "<vendor>";
End
ProfileItem gid_Brand_Profileitem_Version_BuildVersion
ProfileID = gid_Brand_Profile_Version_Ini;
ModuleID = gid_Module_Root_Brand;
Section = "Version";
Order = 17;
Key = "BuildVersion";
Value = "<buildversion>";
End
ProfileItem gid_Brand_Profileitem_Version_Ooobaseversion
ProfileID = gid_Brand_Profile_Version_Ini;
ModuleID = gid_Module_Root_Brand;
......
scp2/source/ooo/file_font_ooo.scp
Dosyayı görüntüle @ f115ddb6
......@@ -160,3 +160,30 @@ End
#endif
#endif
#ifdef WNT
#ifdef WITH_AGFA_MONOTYPE_FONTS
STD_FONTWIN_FILE( gid_File_Fnt_albw, albw.ttf, AlbanyAMT)
STD_FONTWIN_FILE( gid_File_Fnt_albwb, albwb.ttf, AlbanyAMT Bold)
STD_FONTWIN_FILE( gid_File_Fnt_albwbi, albwbi.ttf, AlbanyAMT Bold Italic)
STD_FONTWIN_FILE( gid_File_Fnt_albwi, albwi.ttf, AlbanyAMT Italic)
STD_FONTWIN_FILE( gid_File_Fnt_andybol, andybol_.ttf, AndyMT Bold)
STD_FONTWIN_FILE( gid_File_Fnt_andyreg, andyreg_.ttf, AndyMT)
STD_FONTWIN_FILE( gid_File_Fnt_ans, ans_____.ttf, Andale Sans)
STD_FONTWIN_FILE( gid_File_Fnt_ansb, ansb____.ttf, Andale Sans Bold)
STD_FONTWIN_FILE( gid_File_Fnt_ansbi, ansbi___.ttf, Andale Sans Bold Italic)
STD_FONTWIN_FILE( gid_File_Fnt_ansi, ansi____.ttf, Andale Sans Italic)
STD_FONTWIN_FILE( gid_File_Fnt_bl, bl______.ttf, BellMT)
STD_FONTWIN_FILE( gid_File_Fnt_blb, blb_____.ttf, BellMT Bold)
STD_FONTWIN_FILE( gid_File_Fnt_blbi, blbi____.ttf, BellMT Bold Italic)
STD_FONTWIN_FILE( gid_File_Fnt_bli, bli_____.ttf, BellMT Italic)
STD_FONTWIN_FILE( gid_File_Fnt_cumbwb, cumbwb__.ttf, CumberlandAMT Bold)
STD_FONTWIN_FILE( gid_File_Fnt_cumbwbi, cumbwbi_.ttf, CumberlandAMT Bold Italic)
STD_FONTWIN_FILE( gid_File_Fnt_cumbwi, cumbwi__.ttf, CumberlandAMT Italic)
STD_FONTWIN_FILE( gid_File_Fnt_cumbwr, cumbwr__.ttf, CumberlandAMT)
STD_FONTWIN_FILE( gid_File_Fnt_mtsorts, mtsorts_.ttf, Monotype Sorts)
STD_FONTWIN_FILE( gid_File_Fnt_thowb, thowb___.ttf, ThorndaleAMT Bold)
STD_FONTWIN_FILE( gid_File_Fnt_thowbi, thowbi__.ttf, ThorndaleAMT Bold Italic)
STD_FONTWIN_FILE( gid_File_Fnt_thowi, thowi___.ttf, ThorndaleAMT Italic)
STD_FONTWIN_FILE( gid_File_Fnt_thowr, thowr___.ttf, ThorndaleAMT)
#endif
#endif
scp2/source/ooo/windowscustomaction_ooo.scp
Dosyayı görüntüle @ f115ddb6
......@@ -54,6 +54,15 @@ WindowsCustomAction gid_Customaction_Regallmsdocdll
Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And _IsSetupTypeMin<>\"Custom\"", "CostFinalize");
End
WindowsCustomAction gid_Customaction_Restoreregallmsdocdll
Name = "Restoreregallmsdocdll";
Typ = "65";
Source = "reg4allmsdoc.dll";
Target = "RestoreRegAllMSDoc";
Inbinarytable = 1;
Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "end");
End
WindowsCustomAction gid_Customaction_Regactivexdll1
Name = "Regactivexdll1";
Typ = "65";
......
solenv/bin/linkoo
Dosyayı görüntüle @ f115ddb6
......@@ -35,6 +35,8 @@ use strict;
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
# This file substantially, if not wholely written by volunteers, not Oracle
#
#*************************************************************************
# ends up in program/ooenv
......
solenv/bin/modules/installer/scriptitems.pm
Dosyayı görüntüle @ f115ddb6
......@@ -829,6 +829,8 @@ sub replace_setup_variables
$value =~ s/\<sourceid\>/$installer::globals::build/;
$value =~ s/\<updateid\>/$updateid/;
$value =~ s/\<pkgformat\>/$installer::globals::packageformat/;
$value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/;
$value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/;
$oneitem->{'Value'} = $value;
}
......
solenv/bin/modules/par2script/work.pm
Dosyayı görüntüle @ f115ddb6
......@@ -169,7 +169,10 @@ sub collect_definitions
$oneitem = $1;
$gid = $2;
} else {
par2script::exiter::exit_program("ERROR: malformed par file, expecting <token> <gid> but saw '$line'", "test_par_syntax");
chomp ($line);
my $invalid = $line;
$invalid =~ s/[\s\w]*//g;
par2script::exiter::exit_program("ERROR: malformed par file, invalid character '$invalid', expecting <token> <gid> but saw '$line'", "test_par_syntax");
}
# print STDERR "line '$line' -> '$oneitem' '$gid'\n";
......
solenv/bin/relocate
Dosyayı görüntüle @ f115ddb6
......@@ -34,6 +34,8 @@
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
# written substantially, if not entirely by non-Sun volunteers
#
#*************************************************************************
sub sniff_set($)
......@@ -105,30 +107,63 @@ sub rewrite_set($$$)
sed_file ("$new_root/$set", \&rewrite_value, \%state);
}
sub find_old_root($$)
sub read_set($$)
{
my $new_root = shift;
my $set = shift;
my $fname = "$new_root/$set";
my $old_root;
my $file;
my %env_keys;
open ($file, $fname) || die "Can't open $fname: $!";
while (<$file>) {
if (/\s*([^=]+)\s*=\s*\"([^\"]+)\"/) {
my ($name, $value) = ($1, $2);
if ($name eq 'SRC_ROOT') {
$old_root = $value;
last;
}
$env_keys{$name} = $value;
}
}
close ($file) || die "Failed to close $fname: $!";
return $old_root;
return \%env_keys;
}
sub sed_file_no_touch($$$)
{
my ($new_root, $old_root, $file) = @_;
my ($fin, $fout);
($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
$atime,$mtime,$ctime,$blksize,$blocks) = stat ($file);
open ($fin, $file) || die "Can't open $fin: $!";
open ($fout, ">$file.sed.bak") || die "Can't open $file.sed.bak: $!";
while (<$fin>) {
s/$old_root/$new_root/g;
print $fout $_;
}
close ($fin);
close ($fout);
rename ("$file.sed.bak", $file);
# print "rename $file.sed.bak to $file\n";
utime $atime, $mtime, $file;
}
sub sed_no_touch_recursive ($$$)
{
my ($new_root, $old_root, $dir) = @_;
my $dh;
opendir ($dh, $dir) || die "Can't open dir: $dir: $!";
while (my $entry = readdir ($dh)) {
$entry =~ /^\./ && next;
my $path = "$dir/$entry";
sed_no_touch_recursive ($new_root, $old_root, $path) if (-d $path);
sed_file_no_touch ($new_root, $old_root, $path) if (-f $path);
}
closedir ($dh);
}
sub rewrite_product_deps($$$)
......@@ -144,8 +179,8 @@ sub rewrite_product_deps($$$)
while ($name = readdir ($misc_dir)) {
# Should try re-writing these - but perhaps this would
# screw with timestamps ?
if ($name =~ m/\.dpcc$/ || $name =~ m/\.dpslo$/ || $name =~ m/\.dpobj$/) {
unlink ("$path/$name");
if ($name =~ m/\.dpcc$/ || $name =~ m/\.dpslo$/ || $name =~ m/\.dpobj$/) {
sed_file_no_touch ($new_root, $old_root, "$path/$name");
}
}
closedir ($misc_dir);
......@@ -177,6 +212,33 @@ sub rewrite_dpcc($$)
closedir ($sub_dir);
}
closedir ($top_dir);
print "\n";
}
sub rewrite_symlinks($$)
{
my $new_root = shift;
my $old_root = shift;
my $dirh;
opendir ($dirh, $new_root);
while (my $ent = readdir ($dirh)) {
$ent =~ /^\./ && next;
my $link = "$new_root/$ent";
-l $link || next;
my $target = readlink ($link);
my $newtarget = $target;
$newtarget =~ s/$old_root/$new_root/;
print "Re-write link $target to $newtarget\n";
if ($newtarget eq $target) {
print STDERR "unusual - possibly stale link: $target\n";
if ($target =~ m/\/clone\//) { die "failed to rename link"; }
} else {
unlink ($link);
symlink ($newtarget, $link);
}
}
closedir ($dirh);
}
sub rewrite_bootstrap($$)
......@@ -210,17 +272,27 @@ substr ($OOO_BUILD, 0, 1) eq '/' || die "relocate requires absolute paths";
my $set;
$set = sniff_set($OOO_BUILD) || die "Can't find env. set";
$OLD_ROOT = find_old_root($OOO_BUILD, $set);
my $env_keys = read_set ($OOO_BUILD, $set);
$OLD_ROOT = $env_keys->{'SRC_ROOT'};
my $solver = $env_keys->{SOLARVER} . "/" . $env_keys->{INPATH};
print "Relocate: $OLD_ROOT -> $OOO_BUILD\n";
if ($OLD_ROOT eq $OOO_BUILD) {
print "nothing to do\n";
exit 0;
}
print "re-writing environment:\n";
rewrite_set($OOO_BUILD, $OLD_ROOT, $set);
rewrite_bootstrap($OOO_BUILD, $OLD_ROOT);
print "re-writing symlinks\n";
rewrite_symlinks($OOO_BUILD, $OLD_ROOT);
print "re-writing dependencies:\n";
rewrite_dpcc($OOO_BUILD, $OLD_ROOT);
print "re-writing new dependencies:\n";
sed_no_touch_recursive ($OOO_BUILD, $OLD_ROOT, "$solver/workdir/Dep");
print "re-writing environment:\n";
rewrite_set($OOO_BUILD, $OLD_ROOT, $set);
rewrite_bootstrap($OOO_BUILD, $OLD_ROOT);
print "done.\n";
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment