[Libreoffice-commits] .: 37 commits - configure.in instsetoo_native/util scp2/source solenv/bin
Petr Mladek
pmladek at kemper.freedesktop.org
Wed Apr 6 12:25:07 PDT 2011
configure.in | 33 +++-
instsetoo_native/util/makefile.mk | 41 +++++
instsetoo_native/util/openoffice.lst | 141 ++++++++++++++++++
scp2/source/accessories/file_font_accessories.scp | 150 ++++++++++----------
scp2/source/accessories/module_font_accessories.scp | 68 ++++-----
scp2/source/ooo/common_brand.scp | 18 ++
scp2/source/ooo/windowscustomaction_ooo.scp | 9 +
solenv/bin/linkoo | 2
solenv/bin/modules/installer/scriptitems.pm | 2
solenv/bin/modules/par2script/work.pm | 5
solenv/bin/relocate | 106 +++++++++++---
11 files changed, 442 insertions(+), 133 deletions(-)
New commits:
commit cc982a31386430239dd74523cba173ad216d0904
Merge: 2231f62... 0b48fe0...
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Apr 6 21:22:30 2011 +0200
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/bootstrap
in32-agfa-monotype-fonts.diff patch.
commit 2231f62c293913e17c551cce929f29ca38ab24e6
Merge: e25b614... d421ddb...
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Apr 6 19:25:22 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-4'
commit d421ddb805a0f1ea819908fb7865883812ba1682
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Apr 4 12:21:44 2011 +0200
add lomenubar lib
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 6423d38..86ef48c 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -250,6 +250,10 @@ SCPDEFS+=-DMINGW_GCCDLL=\""$(MINGW_GCCDLL)"\"
SCPDEFS+=-DMINGW_GXXDLL=\""$(MINGW_GXXDLL)"\"
.ENDIF
+.IF "$(ENABLE_LOMENUBAR)" == "TRUE"
+SCPDEFS+=-DENABLE_LOMENUBAR
+.ENDIF
+
SCP_PRODUCT_TYPE=osl
ICUVERSION_DEPENDENT_FILES= \
commit 1f09dd9b7fc8d902042ebbc575904c0e39fc931b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Apr 1 19:39:40 2011 +0200
add lomenubar lib
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 3b433b3..fde7f70 100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1806,3 +1806,7 @@ File gid_File_Lib_sellangmsi
Name = "sellangmsi.dll";
End
#endif
+
+#ifdef ENABLE_LOMENUBAR
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Lomenubar, lomenubar.uno )
+#endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index faa50a3..d7883e9 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -431,6 +431,9 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Fps,
gid_File_Lib_Ftransl,
gid_File_Lib_Lngpckinsthlp,
+#ifdef ENABLE_LOMENUBAR
+ gid_File_Lib_Lomenubar,
+#endif
gid_File_Lib_sn_tools,
gid_File_Lib_relnotes,
GID_FILE_LIB_WPD,
@@ -875,4 +878,3 @@ End
// End
// #endif
-
commit 34e8665b5d3544c48086701d9f758ef0b9d900f8
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Apr 6 15:16:03 2011 +0200
Fall back to --hash-style=sysv when gnu is not supported
Based on patch by Francois Tigeot <ftigeot at wolfpond dot org>
diff --git a/configure.in b/configure.in
index 7dab161..7f006af 100755
--- a/configure.in
+++ b/configure.in
@@ -964,8 +964,10 @@ AC_ARG_WITH(system-mozilla,
WITH_SYSTEM_MOZILLA=no)
AC_ARG_WITH(linker-hash-style,
-[ --with-linker-hash-style
-], WITH_LINKER_HASH_STYLE=$withval, WITH_LINKER_HASH_STYLE=gnu)
+ AS_HELP_STRING([--with-linker-hash-style],
+ [Use linker with --hash-style=<style> when linking shared objects.
+ Possible values: "sysv", "gnu", "both". The default value is "gnu"
+ if supported on the build system, and "sysv" otherwise.]))
AC_ARG_WITH(stlport,
AS_HELP_STRING([--with-stlport],
@@ -2028,21 +2030,43 @@ if test "$_os" = "SunOS"; then
fi
fi
-if test "$GCC" = "yes"; then
- AC_MSG_CHECKING( for --hash-style=$WITH_LINKER_HASH_STYLE linker support )
- hash_style_ldflags_save=$LDFLAGS
- LDFLAGS="$LDFLAGS -Wl,--hash-style=$WITH_LINKER_HASH_STYLE"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([
- #include <stdio.h>
- ],[
- printf ("hello world\n");
- ])], HAVE_LD_HASH_STYLE=TRUE, HAVE_LD_HASH_STYLE=FALSE)
- if test "z$HAVE_LD_HASH_STYLE" = "zTRUE"; then
- AC_MSG_RESULT( found )
+HAVE_LD_HASH_STYLE=FALSE
+WITH_LINKER_HASH_STYLE=
+AC_MSG_CHECKING( for --hash-style gcc linker support )
+if test "$GCC" = "yes" ; then
+ if test -z "$with_linker_hash_style" -o "$with_linker_hash_style" = "yes" ; then
+ hash_styles="gnu sysv"
+ elif test "$with_linker_hash_style" = "no" ; then
+ hash_styles=
else
- AC_MSG_RESULT( not found )
+ hash_styles="$with_linker_hash_style"
+ fi
+
+ for hash_style in $hash_styles ; do
+ test "$HAVE_LD_HASH_STYLE" = "TRUE" && continue
+ hash_style_ldflags_save=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,--hash-style=$hash_style"
+
+ AC_TRY_RUN([
+#include <stdio.h>
+
+int main(char argc, char** argv) {
+ printf ("hello world\n");
+ return 0;
+}
+ ], HAVE_LD_HASH_STYLE=TRUE; WITH_LINKER_HASH_STYLE=$hash_style, HAVE_LD_HASH_STYLE=FALSE)
+
+ LDFLAGS=$hash_style_ldflags_save
+ done
+
+ if test "$HAVE_LD_HASH_STYLE" = "TRUE"; then
+ AC_MSG_RESULT( $WITH_LINKER_HASH_STYLE )
+ else
+ AC_MSG_RESULT( no )
fi
LDFLAGS=$hash_style_ldflags_save
+else
+ AC_MSG_RESULT( no )
fi
AC_SUBST(HAVE_LD_HASH_STYLE)
AC_SUBST(WITH_LINKER_HASH_STYLE)
commit e9cbbdc20c3a8c2d4748883be23d7cf5a7ecd457
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Apr 6 15:15:11 2011 +0300
Add possibility to bundle some Agfa Monotype fonts
Based on the old novell-win32-agfa-monotype-fonts.diff patch.
diff --git a/configure.in b/configure.in
index 0b89ffe..7dab161 100755
--- a/configure.in
+++ b/configure.in
@@ -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
@@ -7291,6 +7298,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 ===================================================================
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index ae1939c..8b42a94 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -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
commit 74fa8f56016d815d8f7c04786b5a6cc33d755150
Merge: db3b9f2... 6b2e030...
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 5 20:20:37 2011 +0200
Merge branch 'libreoffice-3-4' of ssh://git.freedesktop.org/git/libreoffice/bootstrap into libreoffice-3-4
commit 6b2e030071be554c7d34920a0b5d1edd87a2b1bf
Author: Michael Meeks <michael.meeks at novell.com>
Date: Tue Apr 5 18:14:45 2011 +0100
re-write symlinks too to avoid serious confusion
diff --git a/solenv/bin/relocate b/solenv/bin/relocate
index d6ecaf4..09b395a 100755
--- a/solenv/bin/relocate
+++ b/solenv/bin/relocate
@@ -215,6 +215,32 @@ sub rewrite_dpcc($$)
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($$)
{
my $new_root = shift;
@@ -251,18 +277,22 @@ $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";
commit e63a7449a5ba2b572dbc822b489727cb60956e9f
Author: Michael Meeks <michael.meeks at novell.com>
Date: Tue Apr 5 17:17:56 2011 +0100
fix relocate to re-write the new dependency files
diff --git a/solenv/bin/relocate b/solenv/bin/relocate
index 3fa6300..d6ecaf4 100755
--- a/solenv/bin/relocate
+++ b/solenv/bin/relocate
@@ -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,7 @@ sub rewrite_dpcc($$)
closedir ($sub_dir);
}
closedir ($top_dir);
+ print "\n";
}
sub rewrite_bootstrap($$)
@@ -210,7 +246,9 @@ 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";
@@ -223,4 +261,8 @@ 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 "done.\n";
commit 72724ef0c4996eee4e8ef79a5b72944779c70c2a
Author: Robert Nagy <robert at openbsd.org>
Date: Tue Apr 5 17:54:04 2011 +0200
use the GNUMAKE environment variable for telling the user what to run
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 38c81c7..2234975 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -3526,7 +3526,7 @@ sub check_partial_gnumake_build {
print "This module has been migrated to GNU make.\n";
print "You can only use build --all/--since here with build.pl.\n";
print "To do the equivalent of 'build && deliver' call:\n";
- print "\tmake -sr\n";
+ print "\t$ENV{GNUMAKE} -sr\n";
print "in the module root (This will modify the solver).\n";
exit 1;
}
commit db3b9f257d716239cb73fa6a1cd866b0c6ff771b
Merge: bd88391... 1492720...
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 5 17:48:49 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
instsetoo_native/util/openoffice.lst
solenv/inc/minor.mk
diff --cc instsetoo_native/util/makefile.mk
index d478d07,7951ff6..470d562
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@@ -293,9 -332,8 +332,9 @@@ openoffice
.ENDIF # "$(alllangiso)"!=""
+.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
diff --cc instsetoo_native/util/openoffice.lst
index 0b3043c,ba63550..15288af
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@@ -4,9 -4,9 +4,9 @@@ Global
{
variables
{
- OOOBASEVERSION 3.3
- OOOPACKAGEVERSION 3.3.2
- UREPACKAGEVERSION 1.7.0
+ OOOBASEVERSION 3.4
- OOOPACKAGEVERSION 3.4.0
++ OOOPACKAGEVERSION 3.4.0
+ UREPACKAGEVERSION 3.4.0
URELAYERVERSION 1
BASISROOTNAME LibreOffice
UNIXBASISROOTNAME libreoffice
@@@ -389,6 -392,145 +389,145 @@@ LibreOffice_Dev_SD
active 1
compression 5
script sdkoo
- include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarcommonpath}/bin.{minor},{solarenvpath}/{os}/MS
+ 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
+ }
+ }
commit 00e44fe20767db5a0e777ff7b4176a7079053032
Merge: 2b03888... bd88391...
Author: Robert Nagy <robert at openbsd.org>
Date: Tue Apr 5 17:26:18 2011 +0200
Merge branch 'libreoffice-3-4' of git://anongit.freedesktop.org/git/libreoffice/bootstrap into libreoffice-3-4
commit 2b03888a918b7020a1f9330686dc531222057573
Author: Robert Nagy <robert at openbsd.org>
Date: Tue Apr 5 17:21:10 2011 +0200
fix linking to the python library (use -L$PYLIBDIR -lpython$pyver)
as far as i saw the reason to use an absolute path for linking instead
of using -lpythonX.XX is that at least debian does not ship a shared
object within the basic python3 package so you have to install the -dev
package (that's kinda weird^H^H^H^H^Hf***ed up).
diff --git a/configure.in b/configure.in
index a49bd88..c9dd470 100755
--- a/configure.in
+++ b/configure.in
@@ -4120,9 +4120,9 @@ elif test -n "$with_system_python" -o -n "$with_system_libs" && \
python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
python_libs=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'));"`
- python_ldlib=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR') + '/' + distutils.sysconfig.get_config_var('LDLIBRARY'));"`
+ python_libdir=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR'));"`
PYTHON_CFLAGS="-I$python_include"
- PYTHON_LIBS="$python_ldlib $python_libs"
+ PYTHON_LIBS="-L$python_libdir -lpython$python_version $python_libs"
fi
if test "$with_system_python" = "yes" ; then
SYSTEM_PYTHON=YES
commit bd88391398f8305faaac7a9e636b33b58b3fd374
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Apr 5 17:41:07 2011 +0300
Add two new lines to .versionrc (version.ini on Windows)
"Vendor" with the value of OOO_VENDOR, and "BuildVersion" with the
value of BUILD_VER_STRING. These get their values from the
--with-vendor and --with-build-version switches of the configure
script.
From the build-identification.diff patch, has been part of distro
OOo/LO builds for long.
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 3bf0366..5f34ebc 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -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;
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 81b94ed..346a039 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -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;
}
commit 1492720646d125b338fd341f756afdf78a145401
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Mar 15 17:40:07 2011 +0100
bump product version to 3.3.2rc2, release number to 202
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index e29898b..ba63550 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -57,7 +57,7 @@ LibreOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -126,7 +126,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -191,7 +191,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
@@ -269,7 +269,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
LICENSENAME LGPL
SERVICESPROJEKT 1
SETSTATICPATH 1
@@ -310,7 +310,7 @@ LibreOffice_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
@@ -355,7 +355,7 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
@@ -407,7 +407,7 @@ OxygenOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -476,7 +476,7 @@ OxygenOffice_wJRE
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 1183fa2..7c2afe6 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m19(Build:201)
-BUILD=201
+RSCREVISION=330m19(Build:202)
+BUILD=202
LAST_MINOR=m19
SOURCEVERSION=OOO330
commit c2dbf7be7d51f7957770ab0d6bbe84e614913750
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Apr 5 17:04:39 2011 +0300
Recognize also Interix
I did some initial testing with building under Interix some years
ago. Nothing came out of it, and LibreOffice certainly won't build
with it. But just commit this triviality now to get rid of
win32-interix.diff in the build repo.
diff --git a/configure.in b/configure.in
index a7fdca7..eaf7a67 100755
--- a/configure.in
+++ b/configure.in
@@ -1435,7 +1435,7 @@ case "$host_os" in
test_cups=no
_os=GNU
;;
- cygwin*) # Windows
+ cygwin*|interix*) # Windows
test_cups=no
test_randr=no
test_freetype=no
commit 84724f5b8a45c2d74432d336fa1d544b57967f30
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Apr 5 16:32:50 2011 +0300
bnc#530872: Save old associations for MS doc types when installing
Then restore them, if still relevant, when uninstalling LibreOffice.
git log from build repository:
commit 1737ec9b6675cc7e30df03fa5537012a429425bb
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Oct 14 15:28:55 2010 +0300
Make win32-restore-associations.diff apply again
commit 72a25ab4a055cd1d3cf5aec627cfe120113bfb34
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu May 20 10:34:24 2010 +0300
Make patches apply for a Windows build
commit d635f716a75d8c1648eab0c1d598b390be8c4f07
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Sep 17 22:16:40 2009 +0300
Add new patch to restore MSO file associations on uninstall
* patches/dev300/apply: Add it to Win32Only
* patches/dev300/win32-restore-associations.diff: New file. Save
previous associations of the MS Office file formats on installation
of OOo. On uninstallation of OOo, restore them. Still a bit
experimental, but seems to work.
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 6cae743..dd08744 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -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";
commit 918685b04662b23855efd486e0fe9e7b438176c2
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 5 12:26:12 2011 +0200
make sure that the system po2oo support --skipsource option
diff --git a/configure.in b/configure.in
index a49bd88..a7fdca7 100755
--- a/configure.in
+++ b/configure.in
@@ -4165,6 +4165,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])
@@ -4174,9 +4177,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
commit 893dcc8225bca7701400cf25578ecf06f9b87b9f
Author: Alexander Thurgood <alex.thurgood at gmail.com>
Date: Mon Apr 4 16:24:49 2011 +0100
remove invalid - symbols in par token names
diff --git a/scp2/source/accessories/file_font_accessories.scp b/scp2/source/accessories/file_font_accessories.scp
index 919fe16..2683ed9 100644
--- a/scp2/source/accessories/file_font_accessories.scp
+++ b/scp2/source/accessories/file_font_accessories.scp
@@ -485,174 +485,174 @@ STD_FONT_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque )
/* Additional fonts for 2.0.3 */
-/* -URW-Gothic L */
+/* URW Gothic L */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Avantgarde, a010013l.ttf, -URW-Gothic L )
+STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Avantgarde, a010013l.ttf, URW Gothic L )
#endif
-/* -URW-Gothic L Bold */
+/* URW Gothic L Bold */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde, a010015l.ttf, -URW-Gothic L Bold )
+STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Bold_Avantgarde, a010015l.ttf, URW Gothic L Bold )
#endif
-/* -URW-Gothic L Italic */
+/* URW Gothic L Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde, a010033l.ttf, -URW-Gothic L Italic )
+STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Italic_Avantgarde, a010033l.ttf, URW Gothic L Italic )
#endif
-/* -URW-Gothic L Bold Italic */
+/* URW Gothic L Bold Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, -URW-Gothic L Bold Italic )
+STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, URW Gothic L Bold Italic )
#endif
-/* -URW-Bookman L */
+/* URW Bookman L */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bookman, b018012l.ttf, -URW-Bookman L )
+STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bookman, b018012l.ttf, URW Bookman L )
#endif
-/* -URW-Bookman L Bold */
+/* URW Bookman L Bold */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Bookman, b018015l.ttf, -URW-Bookman L Bold )
+STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bold_Bookman, b018015l.ttf, URW Bookman L Bold )
#endif
-/* -URW-Bookman L Italic */
+/* URW Bookman L Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Italic_Bookman, b018032l.ttf, -URW-Bookman L Italic )
+STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Italic_Bookman, b018032l.ttf, URW Bookman L Italic )
#endif
-/* -URW-Bookman L Bold Italic */
+/* URW Bookman L Bold Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman, b018035l.ttf, -URW-Bookman L Bold Italic )
+STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bold_Italic_Bookman, b018035l.ttf, URW Bookman L Bold Italic )
#endif
-/* -URW-Century Schoolbook L */
+/* URW Century Schoolbook L */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, -URW-Century Schoolbook L )
+STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, URW Century Schoolbook L )
#endif
-/* -URW-Century Schoolbook L Bold */
+/* URW Century Schoolbook L Bold */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, -URW-Century Schoolbook L Bold )
+STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, URW Century Schoolbook L Bold )
#endif
-/* -URW-Century Schoolbook L Italic */
+/* URW Century Schoolbook L Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, -URW-Century Schoolbook L Italic )
+STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, URW Century Schoolbook L Italic )
#endif
-/* -URW-Century Schoolbook L Bold Italic */
+/* URW Century Schoolbook L Bold Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, -URW-Century Schoolbook L Bold Italic )
+STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, URW Century Schoolbook L Bold Italic )
#endif
-/* -URW-Nimbus Sans L */
+/* URW Nimbus Sans L */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica, n019003l.ttf, -URW-Nimbus Sans L )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica, n019003l.ttf, URW Nimbus Sans L )
#endif
-/* -URW-Nimbus Sans L Bold */
+/* URW Nimbus Sans L Bold */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, -URW-Nimbus Sans L Bold )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, URW Nimbus Sans L Bold )
#endif
-/* -URW-Nimbus Sans L Italic */
+/* URW Nimbus Sans L Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, -URW-Nimbus Sans L Italic )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, URW Nimbus Sans L Italic )
#endif
-/* -URW-Nimbus Sans L Bold Italic */
+/* URW Nimbus Sans L Bold Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, -URW-Nimbus Sans L Bold Italic )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, URW Nimbus Sans L Bold Italic )
#endif
-/* -URW-Nimbus Sans L Condensed */
+/* URW Nimbus Sans L Condensed */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, -URW-Nimbus Sans L Condensed )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, URW Nimbus Sans L Condensed )
#endif
-/* -URW-Nimbus Sans L Bold Condensed */
+/* URW Nimbus Sans L Bold Condensed */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, -URW-Nimbus Sans L Bold Condensed )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, URW Nimbus Sans L Bold Condensed )
#endif
-/* -URW-Nimbus Sans L Italic Condensed */
+/* URW Nimbus Sans L Italic Condensed */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, -URW-Nimbus Sans L Italic Condensed )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, URW Nimbus Sans L Italic Condensed )
#endif
-/* -URW-Nimbus Sans L Bold Italic Condensed */
+/* URW Nimbus Sans L Bold Italic Condensed */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, -URW-Nimbus Sans L Bold Italic Condensed )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, URW Nimbus Sans L Bold Italic Condensed )
#endif
-/* -URW-Nimbus Roman No9 L */
+/* URW Nimbus Roman No9 L */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times, n021003l.ttf, -URW-Nimbus Roman No9 L )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Times, n021003l.ttf, URW Nimbus Roman No9 L )
#endif
-/* -URW-Nimbus Roman No9 L Bold */
+/* URW Nimbus Roman No9 L Bold */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, -URW-Nimbus Roman No9 L Bold )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, URW Nimbus Roman No9 L Bold )
#endif
-/* -URW-Nimbus Roman No9 L Italic */
+/* URW Nimbus Roman No9 L Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, -URW-Nimbus Roman No9 L Italic )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, URW Nimbus Roman No9 L Italic )
#endif
-/* -URW-Nimbus Roman No9 L Bold Italic */
+/* URW Nimbus Roman No9 L Bold Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, -URW-Nimbus Roman No9 L Bold Italic )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, URW Nimbus Roman No9 L Bold Italic )
#endif
-/* -URW-Nimbus Mono L */
+/* URW Nimbus Mono L */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Courier, n022003l.ttf, -URW-Nimbus Mono L )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Courier, n022003l.ttf, URW Nimbus Mono L )
#endif
-/* -URW-Nimbus Mono L Bold */
+/* URW Nimbus Mono L Bold */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier, n022004l.ttf, -URW-Nimbus Mono L Bold )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Courier, n022004l.ttf, URW Nimbus Mono L Bold )
#endif
-/* -URW-Nimbus Mono LK Italic */
+/* URW Nimbus Mono LK Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, -URW-Nimbus Mono LK Italic )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, URW Nimbus Mono LK Italic )
#endif
-/* -URW-Nimbus Mono L Bold Italic */
+/* URW Nimbus Mono L Bold Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, -URW-Nimbus Mono L Bold Italic )
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, URW Nimbus Mono L Bold Italic )
#endif
-/* -URW-Palladio L */
+/* URW Palladio L */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Palitino, p052003l.ttf, -URW-Palladio L )
+STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Palitino, p052003l.ttf, URW Palladio L )
#endif
-/* -URW-Palladio L Bold */
+/* URW Palladio L Bold */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Palitino, p052004l.ttf, -URW-Palladio L Bold )
+STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Bold_Palitino, p052004l.ttf, URW Palladio L Bold )
#endif
-/* -URW-Palladio L Italic */
+/* URW Palladio L Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Italic_Palitino, p052023l.ttf, -URW-Palladio L Italic )
+STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Italic_Palitino, p052023l.ttf, URW Palladio L Italic )
#endif
-/* -URW-Palladio L Bold Italic */
+/* URW Palladio L Bold Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino, p052024l.ttf, -URW-Palladio L Bold Italic )
+STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Bold_Italic_Palitino, p052024l.ttf, URW Palladio L Bold Italic )
#endif
-/* -URW-Standard Symbols L */
+/* URW Standard Symbols L */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Standard_Symbols_L_Symbol, s050000l.ttf, -URW-Standard Symbols L )
+STD_FONT_FILE( gid_File_Fnt_URW_Standard_Symbols_L_Symbol, s050000l.ttf, URW Standard Symbols L )
#endif
-/* -URW-Chancery L */
+/* URW Chancery L */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery, z003034l.ttf, -URW-Chancery L )
+STD_FONT_FILE( gid_File_Fnt_URW_Chancery_L_Zapf_Chancery, z003034l.ttf, URW Chancery L )
#endif
/* Dingbats */
@@ -772,32 +772,32 @@ STD_FONT_FILE( gid_File_Fnt_DTPDingbats, DTPDingbats.ttf, DTP Dingbats )
/* Justus Bold */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Justus-Bold, Justus-Bold.ttf, Justus Bold )
+STD_FONT_FILE( gid_File_Fnt_Justus_Bold, Justus-Bold.ttf, Justus Bold )
#endif
/* Justus Italic Oldstyle */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Justus-ItalicOldstyle, Justus-ItalicOldstyle.ttf, Justus Italic Oldstyle )
+STD_FONT_FILE( gid_File_Fnt_Justus_ItalicOldstyle, Justus-ItalicOldstyle.ttf, Justus Italic Oldstyle )
#endif
/* Justus Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Justus-Italic, Justus-Italic.ttf, Justus Italic )
+STD_FONT_FILE( gid_File_Fnt_Justus_Italic, Justus-Italic.ttf, Justus Italic )
#endif
/* Justus Oldstyle */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Justus-Oldstyle, Justus-Oldstyle.ttf, Justus Oldstyle )
+STD_FONT_FILE( gid_File_Fnt_Justus_Oldstyle, Justus-Oldstyle.ttf, Justus Oldstyle )
#endif
/* Justus Roman */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Justus-Roman, Justus-Roman.ttf, Justus Roman )
+STD_FONT_FILE( gid_File_Fnt_Justus_Roman, Justus-Roman.ttf, Justus Roman )
#endif
/* Justus Versalitas */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Justus-Versalitas, Justus-Versalitas.ttf, Justus Versalitas )
+STD_FONT_FILE( gid_File_Fnt_Justus_Versalitas, Justus-Versalitas.ttf, Justus Versalitas )
#endif
/* Let's trace basic */
@@ -812,7 +812,7 @@ STD_FONT_FILE( gid_File_Fnt_Lets_trace_ruled, letstraceruled.ttf, Lets trace rul
/* Tuffy Bold Italic */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold_Italic.ttf, Tuffy_Bold_Italic.ttf, Tuffy Bold Italic )
+STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold_Italic, Tuffy_Bold_Italic.ttf, Tuffy Bold Italic )
#endif
/* Tuffy Bold */
diff --git a/scp2/source/accessories/module_font_accessories.scp b/scp2/source/accessories/module_font_accessories.scp
index b2e67a7..b41eb09 100644
--- a/scp2/source/accessories/module_font_accessories.scp
+++ b/scp2/source/accessories/module_font_accessories.scp
@@ -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,
commit fe1ab87715705a6da447d1216ff708589fcc1db2
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Apr 4 16:08:25 2011 +0100
friendlier error on malformed par files
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 37a5f1a..7c96b6a 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -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
diff --git a/solenv/bin/modules/par2script/work.pm b/solenv/bin/modules/par2script/work.pm
index a862420..4d271ca 100644
--- a/solenv/bin/modules/par2script/work.pm
+++ b/solenv/bin/modules/par2script/work.pm
@@ -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";
commit 6c3539d8e1dbad13264b862e1344e3c3a8690dec
Author: Andreas Becker <atayoohoo at googlemail.com>
Date: Mon Apr 4 15:16:30 2011 +0100
python 3 compatibility fixes
diff --git a/configure.in b/configure.in
index 1a5b972..a49bd88 100755
--- a/configure.in
+++ b/configure.in
@@ -4117,11 +4117,12 @@ elif test -n "$with_system_python" -o -n "$with_system_libs" && \
AC_MSG_RESULT([external])
AM_PATH_PYTHON([2.2])
- python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
- python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
- python_libs=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS');"`
+ python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
+ python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
+ python_libs=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'));"`
+ python_ldlib=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR') + '/' + distutils.sysconfig.get_config_var('LDLIBRARY'));"`
PYTHON_CFLAGS="-I$python_include"
- PYTHON_LIBS="-lpython$python_version $python_libs"
+ PYTHON_LIBS="$python_ldlib $python_libs"
fi
if test "$with_system_python" = "yes" ; then
SYSTEM_PYTHON=YES
commit d0716fc3ba8e27405c1f429a288ec94e4a0f31e2
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Apr 4 16:02:41 2011 +0200
check that all configured localizations are supported
a side effect is ALL_LANGS variable
diff --git a/configure.in b/configure.in
index 50ea5e1..1a5b972 100755
--- a/configure.in
+++ b/configure.in
@@ -7681,6 +7681,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])
@@ -7688,6 +7699,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)
commit 5c06f5c95d93502a10c0079daff025fc5c8e0e8f
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Apr 4 15:12:33 2011 +0200
lo-commit-stat: do stat also from the new "translations" repo
diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index 06c2c62..342d47a 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -9,7 +9,7 @@ my $main_repo="bootstrap";
my @pieces=("artwork", "base", "calc", "components",
"extensions", "extras", "filters", "help", "impress",
"libs-core", "libs-extern", "libs-extern-sys", "libs-gui",
- "l10n", "postprocess", "sdk", "testing", "ure", "writer");
+ "translations", "postprocess", "sdk", "testing", "ure", "writer");
sub search_bugs($$$$)
{
commit 0a072026bd18f8b124a632758276f6e285f1d936
Author: Robert Nagy <robert at openbsd.org>
Date: Mon Apr 4 00:26:22 2011 +0200
rework how pthread is handled on openbsd
- remove -pthread from PTHREAD_CFLAGS
- add pthread to gb_STDLIBS
- redefine gb_LinkTarget__command_dynamiclink so that we can
substitute -lpthread with -pthread in the list of libraries
that we link to
diff --git a/configure.in b/configure.in
index 80af57e..50ea5e1 100755
--- a/configure.in
+++ b/configure.in
@@ -1513,7 +1513,7 @@ case "$host_os" in
test_gtk=yes
test_kde=yes
test_freetype=yes
- PTHREAD_CFLAGS="-pthread -D_THREAD_SAFE"
+ PTHREAD_CFLAGS="-D_THREAD_SAFE"
PTHREAD_LIBS="-pthread"
_os=OpenBSD
;;
diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk
index 9121ac7..7386eea 100755
--- a/solenv/gbuild/platform/openbsd.mk
+++ b/solenv/gbuild/platform/openbsd.mk
@@ -37,7 +37,22 @@ endif
gb_Library_DLLPOSTFIX := ob
gb_COMPILERDEFAULTOPTFLAGS := -O2
+gb_STDLIBS := pthread
include $(GBUILDDIR)/platform/unxgcc.mk
+define gb_LinkTarget__command_dynamiclink
+$(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $(1)) && \
+ $(gb_CXX) \
+ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+ $(subst \d,$$,$(RPATH)) $(LDFLAGS) \
+ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+ -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
+ $(subst -lpthread,$(PTHREAD_LIBS),$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
+ -o $(1))
+endef
+
# vim: set noet sw=4:
commit b03d497b90a5d3a5d4315f2becb53378119a11a1
Author: Robert Nagy <robert at openbsd.org>
Date: Sun Apr 3 23:48:52 2011 +0200
merge the bsd platform makefiles into one per platform
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 2306f8f..b10579f 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -153,11 +153,11 @@ else
include $(GBUILDDIR)/platform/windows.mk
endif
else ifeq ($(OS),OPENBSD)
-include $(GBUILDDIR)/platform/openbsd-$(CPUNAME).mk
+include $(GBUILDDIR)/platform/openbsd.mk
else ifeq ($(OS),FREEBSD)
-include $(GBUILDDIR)/platform/freebsd-$(CPUNAME).mk
+include $(GBUILDDIR)/platform/freebsd.mk
else ifeq ($(OS),NETBSD)
-include $(GBUILDDIR)/platform/netbsd-$(CPUNAME).mk
+include $(GBUILDDIR)/platform/netbsd.mk
else ifeq ($(OS),DRAGONFLY)
include $(GBUILDDIR)/platform/dragonfly.mk
else ifeq ($(OS),SOLARIS)
diff --git a/solenv/gbuild/platform/freebsd-INTEL.mk b/solenv/gbuild/platform/freebsd-INTEL.mk
deleted file mode 100755
index 968b44b..0000000
--- a/solenv/gbuild/platform/freebsd-INTEL.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm at redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk
-gb_CPUDEFS := -DX86
-gb_Library_DLLPOSTFIX := fi
-gb_COMPILERDEFAULTOPTFLAGS := -Os
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/freebsd-X86_64.mk b/solenv/gbuild/platform/freebsd-X86_64.mk
deleted file mode 100755
index 3a77c4d..0000000
--- a/solenv/gbuild/platform/freebsd-X86_64.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm at redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk
-gb_CPUDEFS := -D$(CPUNAME)
-gb_Library_DLLPOSTFIX := fx
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
new file mode 100755
index 0000000..6ec9704
--- /dev/null
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -0,0 +1,43 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm at redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk
+
+ifeq ($(CPUNAME),INTEL)
+gb_CPUDEFS := -DX86
+else
+gb_CPUDEFS := -D$(CPUNAME)
+endif
+
+gb_Library_DLLPOSTFIX := fb
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/netbsd-ARM.mk b/solenv/gbuild/platform/netbsd-ARM.mk
deleted file mode 100755
index efa291b..0000000
--- a/solenv/gbuild/platform/netbsd-ARM.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm at redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -DARM32
-gb_Library_DLLPOSTFIX := ba
-gb_COMPILERDEFAULTOPTFLAGS := -Os
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/netbsd-INTEL.mk b/solenv/gbuild/platform/netbsd-INTEL.mk
deleted file mode 100755
index 91b04a4..0000000
--- a/solenv/gbuild/platform/netbsd-INTEL.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm at redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk
-gb_CPUDEFS := -DX86
-gb_Library_DLLPOSTFIX := bi
-gb_COMPILERDEFAULTOPTFLAGS := -Os
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/netbsd-POWERPC.mk b/solenv/gbuild/platform/netbsd-POWERPC.mk
deleted file mode 100755
index cfc0734..0000000
--- a/solenv/gbuild/platform/netbsd-POWERPC.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm at redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -DPOWERPC -DPPC
-gb_Library_DLLPOSTFIX := bp
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-gb_CXXFLAGS += -fsigned-char
-gb_CFLAGS += -fsigned-char
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/netbsd-SPARC.mk b/solenv/gbuild/platform/netbsd-SPARC.mk
deleted file mode 100755
index 2e83303..0000000
--- a/solenv/gbuild/platform/netbsd-SPARC.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm at redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk
-gb_CPUDEFS := -D$(CPUNAME)
-gb_Library_DLLPOSTFIX := bs
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/netbsd-X86_64.mk b/solenv/gbuild/platform/netbsd-X86_64.mk
deleted file mode 100755
index b7d1018..0000000
--- a/solenv/gbuild/platform/netbsd-X86_64.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm at redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk
-gb_CPUDEFS := -D$(CPUNAME)
-gb_Library_DLLPOSTFIX := bx
-gb_COMPILERDEFAULTOPTFLAGS := -Os
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/netbsd.mk b/solenv/gbuild/platform/netbsd.mk
new file mode 100755
index 0000000..1c9134f
--- /dev/null
+++ b/solenv/gbuild/platform/netbsd.mk
@@ -0,0 +1,43 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm at redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk
+
+ifeq ($(CPUNAME),INTEL)
+gb_CPUDEFS := -DX86
+else
+gb_CPUDEFS := -D$(CPUNAME)
+endif
+
+gb_Library_DLLPOSTFIX := nb
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/openbsd-INTEL.mk b/solenv/gbuild/platform/openbsd-INTEL.mk
deleted file mode 100755
index f338566..0000000
--- a/solenv/gbuild/platform/openbsd-INTEL.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm at redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk
-gb_CPUDEFS := -DX86
-gb_Library_DLLPOSTFIX := ob
-gb_COMPILERDEFAULTOPTFLAGS := -Os
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/openbsd-X86_64.mk b/solenv/gbuild/platform/openbsd-X86_64.mk
deleted file mode 100755
index 20b7cff..0000000
--- a/solenv/gbuild/platform/openbsd-X86_64.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm at redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk
-gb_CPUDEFS := -D$(CPUNAME)
-gb_Library_DLLPOSTFIX := ob
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk
new file mode 100755
index 0000000..9121ac7
--- /dev/null
+++ b/solenv/gbuild/platform/openbsd.mk
@@ -0,0 +1,43 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm at redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk
+
+ifeq ($(CPUNAME),INTEL)
+gb_CPUDEFS := -DX86
+else
+gb_CPUDEFS := -D$(CPUNAME)
+endif
+
+gb_Library_DLLPOSTFIX := ob
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:
commit 31332503a7a297f6a6f8c6bf765017171288f6cf
Author: Robert Nagy <robert at openbsd.org>
Date: Sun Apr 3 22:13:19 2011 +0200
add -Wl,--sysroot=$(SYSBASE) to gb_LinkTarget_LDFLAGS only if SYSBASE is !nil
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 5b5d76f..e52684f 100755
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -105,6 +105,8 @@ endif
ifneq ($(strip $(SYSBASE)),)
gb_CXXFLAGS += --sysroot=$(SYSBASE)
gb_CFLAGS += --sysroot=$(SYSBASE)
+gb_LinkTarget_LDFLAGS += \
+ -Wl,--sysroot=$(SYSBASE)
endif
gb_LinkTarget_EXCEPTIONFLAGS := \
-DEXCEPTIONS_ON \
@@ -116,7 +118,6 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \
-fno-exceptions \
gb_LinkTarget_LDFLAGS += \
- -Wl,--sysroot=$(SYSBASE) \
-Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
-Wl,-z,combreloc \
$(subst -L../lib , ,$(SOLARLIB)) \
commit 4e1fe06748aab61cd9742e41bd8b2a36b8e4d26d
Author: Robert Nagy <robert at openbsd.org>
Date: Sun Apr 3 22:10:37 2011 +0200
filter some library names on *BSD too just like on LINUX
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 877419b..15a0f87 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -30,7 +30,7 @@
# Make has no support for 'or' clauses in conditionals,
# we use a filter expression instead.
-ifneq (,$(filter LINUX DRAGONFLY, $(OS)))
+ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
commit fd1e12519877c4e11949655b16b0a6d11b9c52cb
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Apr 1 15:13:13 2011 +0200
Branch libreoffice-3-4
This is 'libreoffice-3-4' - the stable branch for the 3.4.x releases
+ only bug fixes are allowed
+ no approval needed during beta phase (two weeks after branch)
+ 1 approval needed during rc phase and for bugfix releases
+ 2 approvals with different/no affiliation needed for late features
+ regularly merged into master by a selected person when living
Please watch http://wiki.documentfoundation.org/ReleasePlan
and read announces on libreoffice at lists.freedesktop.org
If you want to build something cool, unstable, and risky, use master.
commit 4215649b045643e8153f2f26c79479aa81dd7e07
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Mar 8 15:31:08 2011 +0100
Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1)
commit 7028491d34028c7fa3575a4b5ffa97a5653fa429
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Mar 8 13:56:55 2011 +0100
do not create OxygeOffice rpms for LibreOffice build
there was a cut&paste problem in the previous commit
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 02dd229..7951ff6 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -319,11 +319,11 @@ 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:^".")}
-ooolanguagepack_%{$(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:^".")}
-ooohelppack_%{$(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)"!=""
commit d1cd295b211d0be02aa9c4bfc297e38c1d06a39d
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Mon Mar 7 07:14:00 2011 +0100
Introduce OxygenOffice as a product
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 2388d31..02dd229 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -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:^".")}
+ooolanguagepack_%{$(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:^".")}
+ooohelppack_%{$(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...
@@ -294,7 +333,7 @@ openoffice:
.ENDIF # "$(alllangiso)"!=""
.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
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index ecf6326..e29898b 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -395,3 +395,142 @@ LibreOffice_Dev_SDK
include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarcommonpath}/bin.{minor},{solarenvpath}/{os}/MS
}
}
+
+OxygenOffice
+{
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME OxygenOffice
+ PRODUCTNAME_BR OxygenOffice
+ PRODUCTVERSION 3.3
+ PRODUCTEXTENSION
+ LONG_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION beta1
+ 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 beta1
+ 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
+ }
+}
commit ef7505a3338038cdb9c4bb653ca456e09cc97926
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Mar 7 12:12:18 2011 +0100
bump product version to 3.3.2rc1, release number to 201
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index c70448f..ecf6326 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,7 +5,7 @@ Globals
variables
{
OOOBASEVERSION 3.3
- OOOPACKAGEVERSION 3.3.1
+ OOOPACKAGEVERSION 3.3.2
UREPACKAGEVERSION 1.7.0
URELAYERVERSION 1
BASISROOTNAME LibreOffice
@@ -57,12 +57,12 @@ LibreOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.1
+ ABOUTBOXPRODUCTVERSION 3.3.2
BASEPRODUCTVERSION 3.3
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
@@ -74,7 +74,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.3.1
+ PACKAGEVERSION 3.3.2
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -126,12 +126,12 @@ LibreOffice_wJRE
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.1
+ 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
@@ -142,7 +142,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.3.1
+ PACKAGEVERSION 3.3.2
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -191,14 +191,14 @@ LibreOffice_Dev
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.1
+ ABOUTBOXPRODUCTVERSION 3.3.2
BASEPRODUCTVERSION 3.3
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list