[Libreoffice-commits] .: 6 commits - scp2/source scp2/util solenv/bin solenv/gbuild
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Mar 18 10:03:41 PDT 2011
scp2/source/calc/file_calc.scp | 2
scp2/source/graphicfilter/file_graphicfilter.scp | 2
scp2/source/ooo/datacarrier_ooo.scp | 34 ------
scp2/source/ooo/file_ooo.scp | 4
scp2/source/ooo/makefile.mk | 1
scp2/source/sdkoo/sdkoo.scp | 5
scp2/util/makefile.mk | 2
solenv/bin/modules/par2script/work.pm | 120 +++++++++++------------
solenv/gbuild/platform/windows.mk | 19 ++-
9 files changed, 80 insertions(+), 109 deletions(-)
New commits:
commit d8a18f32db0b4b016e08c93c0b00e3c7e95028ea
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Mar 18 14:15:01 2011 +0100
Remove removed datacarrier from makefile
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 392ce6b..a7873d1 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -44,7 +44,6 @@ SCP1TARGET = setup_osl
SCP1FILES = installation_ooo.par \
scpaction_ooo.par \
directory_ooo.par \
- datacarrier_ooo.par \
file_ooo.par \
file_extra_ooo.par \
file_font_ooo.par \
@@ -230,7 +229,6 @@ SCP2TARGET = setup_osljre
SCP2FILES = installation_ooo.par \
scpaction_ooo.par \
directory_ooo.par \
- datacarrier_ooo.par \
file_ooo.par \
file_extra_ooo.par \
file_font_ooo.par \
commit 38f74085cfdcd2dd30b83a6d5bf572dd00e291b1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Mar 18 11:26:32 2011 +0200
Avoid unnecessary PATH manipulation for exes located in OUTDIR/bin
svidl.exe, transex3.exe and xsltproc.exe are themselves in
${OUTDIR}/bin, so no need to add that directory to PATH when running
them. They will find the DLLs they need from there automatically
anyway.
Besides, the PATH manipulation was wrong as OUTDIR here is a Win32
pathname, starting with a drive letter and colon, while PATH is the
Cygwin one that contains Cygwin pathnames with no drive letters and
with colon as the search path separator. Thus a cygpath -u
transformation of OUTDIR would have been needed to actually make it do
what was intended.
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 551e336..07a7dc9 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -567,7 +567,12 @@ endef
# CppunitTest class
+# cppunittester.exe is in the cppunit subdirectory of ${OUTDIR}/bin,
+# thus it won't find its DLLs unless ${OUTDIR}/bin is added to PATH.
+# PATH is the Cygwin one while ${OUTDIR} is a Win32 pathname, thus
+# cygpath -u.
gb_CppunitTest_CPPTESTPRECOMMAND := PATH="`cygpath -u $(OUTDIR)`/bin:$${PATH}"
+
gb_CppunitTest_SYSPRE := itest_
gb_CppunitTest_EXT := .lib
gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
@@ -636,11 +641,13 @@ endef
# SdiTarget class
-gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+# svidl.exe is in ${OUTDIR}/bin itself, so nothing special needed to have it find
+# DLLs in the same directory
+gb_SdiTarget_SVIDLPRECOMMAND :=
# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+# Ditto for transex3
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND :=
# SrsPartTarget class
@@ -670,7 +677,9 @@ endif
# ComponentTarget
-gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+# See comment for svidl.exe
+gb_XSLTPROCPRECOMMAND :=
+
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
commit b587f61a264a0bc364e3b0fb7524fcf6ce47c240
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Mar 18 09:48:35 2011 +0100
Remove undefined DataCarrier entries from scp2
Michael's fixes turned those into build breaker
diff --git a/scp2/source/ooo/datacarrier_ooo.scp b/scp2/source/ooo/datacarrier_ooo.scp
deleted file mode 100644
index 89bfef1..0000000
--- a/scp2/source/ooo/datacarrier_ooo.scp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-DataCarrier gid_Datacarrier
- Name = "%PRODUCTNAME %PRODUCTVERSION";
- DiskNo = 1;
-End
-
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 329cf37..eb4d92a 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -268,7 +268,6 @@ PARFILES= \
scpaction_ooo.par \
directory_ooo.par \
directory_ooo_macosx.par \
- datacarrier_ooo.par \
file_ooo.par \
file_extra_ooo.par \
file_font_ooo.par \
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index f991f06..a943771 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -39,11 +39,6 @@ Installation gid_Installation_Sdk
#endif
End
-DataCarrier gid_Datacarrier
- Name = "%PRODUCTNAME %PRODUCTVERSION";
- DiskNo = 1;
-End
-
#ifndef MACOSX
#ifdef WNT
commit 130ff7cb182ab655fb90f95aaef4ad8b6eb83d28
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Mar 17 20:46:52 2011 +0000
fix scp2 errors, re-factor, accelerate, and add error detection to parser
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index fc55805..b1fd14b 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -53,7 +53,7 @@ STD_LIB_FILE( gid_File_Lib_Sc, sc)
STD_LIB_FILE( gid_File_Lib_Scui, scui)
-STD_UNO_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
+STD_FILTER_FILE( gid_File_Lib_Scfilt, scfilt)
STD_LIB_FILE( gid_File_Lib_Scd, scd)
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index eeac226..35895bd 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -38,4 +38,4 @@ STD_LIB_FILE( gid_File_Lib_Flash, flash )
STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
-STD_LIB_FILE( gid_File_Lib_WPGImport, wpgimport )
+STD_FILTER_FILE( gid_File_Lib_WPGImport, wpgimport )
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 56cb070..035ab2c 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -314,7 +314,7 @@ File gid_File_Dtd_Toolbar
Name = "toolbar.dtd";
End
-STD_LIB_FILE( gid_File_Filter_Sdfilt, sdfilt)
+STD_FILTER_FILE( gid_File_Filter_Sdfilt, sdfilt)
STD_FILTER_FILE( gid_File_Filter_Eme, eme)
diff --git a/solenv/bin/modules/par2script/work.pm b/solenv/bin/modules/par2script/work.pm
index 273436f..a862420 100644
--- a/solenv/bin/modules/par2script/work.pm
+++ b/solenv/bin/modules/par2script/work.pm
@@ -148,68 +148,72 @@ sub collect_definitions
my $multidefinitionerror = 0;
my @multidefinitiongids = ();
+ my %itemhash;
- foreach $oneitem ( @par2script::globals::allitems )
- {
- my $docollect = 0;
- my $gid = "";
- my %allitemhash = ();
-
- for ( my $i = 0; $i <= $#{$parfilecontent}; $i++ )
- {
- my $line = ${$parfilecontent}[$i];
-
- if ( $line =~ /^\s*$oneitem\s+(\w+)\s*$/ )
- {
- $gid = $1;
- $docollect = 1;
- }
- else
- {
- $docollect = 0;
- }
-
- if ( $docollect )
- {
- my $currentline = $i;
- my %oneitemhash;
-
- while (! ( ${$parfilecontent}[$currentline] =~ /^\s*End\s*$/i ) )
- {
- if ( ${$parfilecontent}[$currentline] =~ /^\s*(.+?)\s*\=\s*(.+?)\s*\;\s*$/ ) # only oneliner!
- {
- $itemkey = $1;
- $itemvalue = $2;
-
- if ( $oneitem eq "Directory" ) { if ( $itemkey =~ "DosName" ) { $itemkey =~ s/DosName/HostName/; } }
- if (( $oneitem eq "Directory" ) || ( $oneitem eq "File" ) || ( $oneitem eq "Unixlink" )) { if ( $itemvalue eq "PD_PROGDIR" ) { $itemvalue = "PREDEFINED_PROGDIR"; }}
- if (( $itemkey eq "Styles" ) && ( $itemvalue =~ /^\s*(\w+)(\s*\;\s*)$/ )) { $itemvalue = "($1)$2"; }
-
- $oneitemhash{$itemkey} = $itemvalue;
- }
-
- $currentline++;
- }
-
- # no hyphen allowed in gids -> cannot happen here because (\w+) is required for gids
- if ( $gid =~ /-/ ) { par2script::exiter::exit_program("ERROR: No hyphen allowed in global id: $gid", "test_of_hyphen"); }
-
- # test of uniqueness
- if ( exists($allitemhash{$gid}) )
- {
- $multidefinitionerror = 1;
- push(@multidefinitiongids, $gid);
- }
-
- $allitemhash{$gid} = \%oneitemhash;
- }
- }
+ # create empty item hashes
+ foreach $oneitem ( @par2script::globals::allitems ) {
+ my %items;
+ $par2script::globals::definitions{$oneitem} = \%items;
+ }
- $par2script::globals::definitions{$oneitem} = \%allitemhash;
+ for ( my $i = 0; $i <= $#{$parfilecontent}; $i++ )
+ {
+ my $line = ${$parfilecontent}[$i];
+ my $oneitem, $gid;
+
+ $line =~ /^\s*$/ && next; # skip blank lines
+
+ # lines should be well formed:
+ if ($line =~ m/^\s*(\w+)\s+(\w+)\s*$/)
+ {
+ $oneitem = $1;
+ $gid = $2;
+ } else {
+ par2script::exiter::exit_program("ERROR: malformed par file, expecting <token> <gid> but saw '$line'", "test_par_syntax");
+ }
+# print STDERR "line '$line' -> '$oneitem' '$gid'\n";
+
+ # hunt badness variously
+ if ( ! defined $par2script::globals::definitions{$oneitem} )
+ {
+ par2script::exiter::exit_program("ERROR: invalid scp2 fragment item type '$oneitem' in line: '$line'", "test_par_syntax");
+ }
+
+ # no hyphen allowed in gids -> cannot happen here because (\w+) is required for gids
+ if ( $gid =~ /-/ ) { par2script::exiter::exit_program("ERROR: No hyphen allowed in global id: $gid", "test_of_hyphen"); }
+
+ my %oneitemhash;
+
+ while (! ( ${$parfilecontent}[$i] =~ /^\s*End\s*$/i ) )
+ {
+ if ( ${$parfilecontent}[$i] =~ /^\s*(.+?)\s*\=\s*(.+?)\s*\;\s*$/ ) # only oneliner!
+ {
+ $itemkey = $1;
+ $itemvalue = $2;
+
+ if ( $oneitem eq "Directory" ) { if ( $itemkey =~ "DosName" ) { $itemkey =~ s/DosName/HostName/; } }
+ if (( $oneitem eq "Directory" ) || ( $oneitem eq "File" ) || ( $oneitem eq "Unixlink" )) { if ( $itemvalue eq "PD_PROGDIR" ) { $itemvalue = "PREDEFINED_PROGDIR"; }}
+ if (( $itemkey eq "Styles" ) && ( $itemvalue =~ /^\s*(\w+)(\s*\;\s*)$/ )) { $itemvalue = "($1)$2"; }
+
+ $oneitemhash{$itemkey} = $itemvalue;
+ }
+ $i++;
+ }
+
+ my $allitemhash = \$par2script::globals::definitions{$oneitem};
+
+ # test of uniqueness
+ if ( defined ($par2script::globals::definitions{$oneitem}->{$gid}) )
+ {
+ $multidefinitionerror = 1;
+ push(@multidefinitiongids, $gid);
+ }
+
+ $par2script::globals::definitions{$oneitem}->{$gid} = \%oneitemhash;
}
- if ( $multidefinitionerror ) { par2script::exiter::multidefinitionerror(\@multidefinitiongids); }
-
+ if ( $multidefinitionerror ) { par2script::exiter::multidefinitionerror(\@multidefinitiongids); }
+
# foreach $key (keys %par2script::globals::definitions)
# {
# print "Key: $key \n";
commit 9180f7f0b332876e49a53c8856b44d42f8710155
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Thu Mar 17 21:42:21 2011 +0100
Fix ppt and wpg import
There's no STD_UNO_LIB_FILE_PATCH anymore
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index ab46b18..eeac226 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -38,4 +38,4 @@ STD_LIB_FILE( gid_File_Lib_Flash, flash )
STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_WPGImport, wpgimport )
+STD_LIB_FILE( gid_File_Lib_WPGImport, wpgimport )
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 0c3392e..56cb070 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -314,9 +314,9 @@ File gid_File_Dtd_Toolbar
Name = "toolbar.dtd";
End
-STD_FILTER_FILE( gid_File_Filter_Eme, eme)
+STD_LIB_FILE( gid_File_Filter_Sdfilt, sdfilt)
-STD_UNO_LIB_FILE_PATCH( gid_File_Filter_Sdfilt, sdfilt)
+STD_FILTER_FILE( gid_File_Filter_Eme, eme)
STD_FILTER_FILE( gid_File_Filter_Icg, icg)
commit d6d04f08e08d8ebc67bf7e196f180500589e2810
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Mar 17 17:30:01 2011 +0200
Set PATH properly when running cppunittester
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 3795343..551e336 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -567,7 +567,7 @@ endef
# CppunitTest class
-gb_CppunitTest_CPPTESTPRECOMMAND :=
+gb_CppunitTest_CPPTESTPRECOMMAND := PATH="`cygpath -u $(OUTDIR)`/bin:$${PATH}"
gb_CppunitTest_SYSPRE := itest_
gb_CppunitTest_EXT := .lib
gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
More information about the Libreoffice-commits
mailing list