[Libreoffice-commits] .: 3 commits - configure.in instsetoo_native/prj scp2/prj solenv/bin solenv/prj soltools/prj stlport/prj
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Jun 3 03:49:15 PDT 2011
configure.in | 37 +++++++++++++++++-------------------
instsetoo_native/prj/d.lst | 6 ++---
scp2/prj/d.lst | 46 ++++++++++++++++++++++-----------------------
solenv/bin/deliver.pl | 43 +++++++++++++++---------------------------
solenv/prj/d.lst | 8 +++----
soltools/prj/d.lst | 22 ++++++++++-----------
stlport/prj/d.lst | 4 +--
7 files changed, 77 insertions(+), 89 deletions(-)
New commits:
commit e5c42faedbdb2801efd29ead332493cdc53fe651
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 3 13:25:33 2011 +0300
Drop %_EXT% which was always empty
diff --git a/instsetoo_native/prj/d.lst b/instsetoo_native/prj/d.lst
index 4a1f33b..c4156b7 100644
--- a/instsetoo_native/prj/d.lst
+++ b/instsetoo_native/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\pus%_EXT%
-..\%COMMON_OUTDIR%\bin\hid\userfeedback_VCL_names.csv %COMMON_DEST%\bin%_EXT%\userfeedback_VCL_names.csv
-..\%__SRC%\misc\*.update.xml %_DEST%\pus%_EXT%\*.update.xml
+mkdir: %_DEST%\pus
+..\%COMMON_OUTDIR%\bin\hid\userfeedback_VCL_names.csv %COMMON_DEST%\bin\userfeedback_VCL_names.csv
+..\%__SRC%\misc\*.update.xml %_DEST%\pus\*.update.xml
diff --git a/scp2/prj/d.lst b/scp2/prj/d.lst
index 717c8c5..37aaabb 100644
--- a/scp2/prj/d.lst
+++ b/scp2/prj/d.lst
@@ -1,27 +1,27 @@
-..\%__SRC%\bin\osl\setup_osl.inf %_DEST%\bin%_EXT%\setup_osl.inf
-..\%__SRC%\bin\osl\setup_osl.ins %_DEST%\bin%_EXT%\setup_osl.ins
-..\%__SRC%\bin\osl\ure.inf %_DEST%\bin%_EXT%\ure.inf
-..\%__SRC%\bin\osl\ure.ins %_DEST%\bin%_EXT%\ure.ins
-..\%__SRC%\bin\osl\sdkoo.inf %_DEST%\bin%_EXT%\sdkoo.inf
-..\%__SRC%\bin\osl\sdkoo.ins %_DEST%\bin%_EXT%\sdkoo.ins
-..\%__SRC%\bin\osl\setup_osljre.inf %_DEST%\bin%_EXT%\setup_osljre.inf
-..\%__SRC%\bin\osl\setup_osljre.ins %_DEST%\bin%_EXT%\setup_osljre.ins
+..\%__SRC%\bin\osl\setup_osl.inf %_DEST%\bin\setup_osl.inf
+..\%__SRC%\bin\osl\setup_osl.ins %_DEST%\bin\setup_osl.ins
+..\%__SRC%\bin\osl\ure.inf %_DEST%\bin\ure.inf
+..\%__SRC%\bin\osl\ure.ins %_DEST%\bin\ure.ins
+..\%__SRC%\bin\osl\sdkoo.inf %_DEST%\bin\sdkoo.inf
+..\%__SRC%\bin\osl\sdkoo.ins %_DEST%\bin\sdkoo.ins
+..\%__SRC%\bin\osl\setup_osljre.inf %_DEST%\bin\setup_osljre.inf
+..\%__SRC%\bin\osl\setup_osljre.ins %_DEST%\bin\setup_osljre.ins
-mkdir: %_DEST%\par%_EXT%
+mkdir: %_DEST%\par
-mkdir: %_DEST%\par%_EXT%\osl
-mkdir: %_DEST%\par%_EXT%\fat
-mkdir: %_DEST%\par%_EXT%\fam
-mkdir: %_DEST%\par%_EXT%\ada
-mkdir: %_DEST%\par%_EXT%\adm
-mkdir: %_DEST%\par%_EXT%\omc
+mkdir: %_DEST%\par\osl
+mkdir: %_DEST%\par\fat
+mkdir: %_DEST%\par\fam
+mkdir: %_DEST%\par\ada
+mkdir: %_DEST%\par\adm
+mkdir: %_DEST%\par\omc
-..\%__SRC%\par\osl\*.par %_DEST%\par%_EXT%\osl\*.par
-..\%__SRC%\par\fat\*.par %_DEST%\par%_EXT%\fat\*.par
-..\%__SRC%\par\fam\*.par %_DEST%\par%_EXT%\fam\*.par
-..\%__SRC%\par\ada\*.par %_DEST%\par%_EXT%\ada\*.par
-..\%__SRC%\par\adm\*.par %_DEST%\par%_EXT%\adm\*.par
-..\%__SRC%\par\omc\*.par %_DEST%\par%_EXT%\omc\*.par
+..\%__SRC%\par\osl\*.par %_DEST%\par\osl\*.par
+..\%__SRC%\par\fat\*.par %_DEST%\par\fat\*.par
+..\%__SRC%\par\fam\*.par %_DEST%\par\fam\*.par
+..\%__SRC%\par\ada\*.par %_DEST%\par\ada\*.par
+..\%__SRC%\par\adm\*.par %_DEST%\par\adm\*.par
+..\%__SRC%\par\omc\*.par %_DEST%\par\omc\*.par
-..\inc\macros.inc %_DEST%\inc%_EXT%\macros.inc
-..\%__SRC%\inc\langmacros.inc %_DEST%\inc%_EXT%\langmacros.inc
+..\inc\macros.inc %_DEST%\inc\macros.inc
+..\%__SRC%\inc\langmacros.inc %_DEST%\inc\langmacros.inc
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index dcc82a8..05cccd4 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -231,7 +231,7 @@ sub do_linklib
return unless $has_symlinks;
$from_dir = expand_macros('../%__SRC%/lib');
- $to_dir = expand_macros('%_DEST%/lib%_EXT%');
+ $to_dir = expand_macros('%_DEST%/lib');
@globbed_files = glob("$from_dir/$lib");
@@ -438,7 +438,6 @@ sub parse_options
sub init_globals
{
- my $ext;
($module, $repository, $base_dir, $dlst_file) = get_base();
# for CWS:
@@ -463,8 +462,6 @@ sub init_globals
exit(3);
}
- $ext = "";
-
# Do we have common trees?
if ( defined($ENV{'common_build'}) && $ENV{'common_build'} eq 'TRUE' ) {
$common_build = 1;
@@ -504,7 +501,6 @@ sub init_globals
[ '%__PRJROOT%', $base_dir ],
[ '%__SRC%', $inpath ],
[ '%_DEST%', $dest ],
- [ '%_EXT%', $ext ],
[ '%COMMON_OUTDIR%', $common_outdir ],
[ '%COMMON_DEST%', $common_dest ],
[ '%GUI%', $gui ]
@@ -575,7 +571,7 @@ sub parse_dlst
if ( /\.res\s/ ) {
my $imagelist = $_;
$imagelist =~ s/\.res/\.$ilst_ext/g;
- $imagelist =~ s/\\bin%_EXT%\\/\\res%_EXT%\\img\\/;
+ $imagelist =~ s/\\bin\\/\\res\\img\\/;
push(@action_data, ['copy', $imagelist]);
}
}
@@ -991,33 +987,33 @@ sub push_default_actions
if ( ! $opt_delete ) {
# create all the subdirectories on solver
foreach $subdir (@subdirs) {
- push(@action_data, ['mkdir', "%_DEST%/$subdir%_EXT%"]);
+ push(@action_data, ['mkdir', "%_DEST%/$subdir"]);
}
if ( $common_build ) {
foreach $subdir (@common_subdirs) {
- push(@action_data, ['mkdir', "%COMMON_DEST%/$subdir%_EXT%"]);
+ push(@action_data, ['mkdir', "%COMMON_DEST%/$subdir"]);
}
}
}
- push(@action_data, ['mkdir', "%_DEST%/inc%_EXT%/$module"]);
+ push(@action_data, ['mkdir', "%_DEST%/inc/$module"]);
if ( $common_build ) {
- push(@action_data, ['mkdir', "%COMMON_DEST%/inc%_EXT%/$module"]);
- push(@action_data, ['mkdir', "%COMMON_DEST%/res%_EXT%/img"]);
+ push(@action_data, ['mkdir', "%COMMON_DEST%/inc/$module"]);
+ push(@action_data, ['mkdir', "%COMMON_DEST%/res/img"]);
} else {
- push(@action_data, ['mkdir', "%_DEST%/res%_EXT%/img"]);
+ push(@action_data, ['mkdir', "%_DEST%/res/img"]);
}
# deliver build.lst to $dest/inc/$module
- push(@action_data, ['copy', "build.lst %_DEST%/inc%_EXT%/$module/build.lst"]);
+ push(@action_data, ['copy', "build.lst %_DEST%/inc/$module/build.lst"]);
if ( $common_build ) {
# ... and to $common_dest/inc/$module
- push(@action_data, ['copy', "build.lst %COMMON_DEST%/inc%_EXT%/$module/build.lst"]);
+ push(@action_data, ['copy', "build.lst %COMMON_DEST%/inc/$module/build.lst"]);
}
# need to copy libstaticmxp.dylib for Mac OS X
if ( $^O eq 'darwin' )
{
- push(@action_data, ['copy', "../%__SRC%/lib/lib*static*.dylib %_DEST%/lib%_EXT%/lib*static*.dylib"]);
+ push(@action_data, ['copy', "../%__SRC%/lib/lib*static*.dylib %_DEST%/lib/lib*static*.dylib"]);
}
}
@@ -1121,11 +1117,7 @@ sub push_on_loglist
my $solarversion = $ENV{'SOLARVERSION'};
$solarversion =~ s#\\#/#g;
$entry[2] =~ s/^\Q$solarversion\E\///;
- # strip minor from 'to'
- my $ext = "%_EXT%";
- $ext = expand_macros($ext);
- $entry[2] =~ s#$ext([\\\/])#$1#o;
-
+
if ( $common ) {
push @common_log_list, [@entry];
} else {
@@ -1140,21 +1132,18 @@ sub zip_files
$zipexe .= ' -y' unless $^O eq 'MSWin32';
my ($platform_zip_file, $common_zip_file);
- $platform_zip_file = "%_DEST%/zip%_EXT%/$module.zip";
+ $platform_zip_file = "%_DEST%/zip/$module.zip";
$platform_zip_file = expand_macros($platform_zip_file);
my (%dest_dir, %list_ref);
$dest_dir{$platform_zip_file} = $dest;
$list_ref{$platform_zip_file} = \@zip_list;
if ( $common_build ) {
- $common_zip_file = "%COMMON_DEST%/zip%_EXT%/$module.zip";
+ $common_zip_file = "%COMMON_DEST%/zip/$module.zip";
$common_zip_file = expand_macros($common_zip_file);
$dest_dir{$common_zip_file} = $common_dest;
$list_ref{$common_zip_file} = \@common_zip_list;
}
- my $ext = "%_EXT%";
- $ext = expand_macros($ext);
-
my @zipfiles;
$zipfiles[0] = $platform_zip_file;
if ( $common_build ) {
@@ -1272,8 +1261,8 @@ sub get_tempfilename
sub write_log
{
my (%log_file, %file_date);
- $log_file{\@log_list} = "%_DEST%/inc%_EXT%/$module/deliver.log";
- $log_file{\@common_log_list} = "%COMMON_DEST%/inc%_EXT%/$module/deliver.log";
+ $log_file{\@log_list} = "%_DEST%/inc/$module/deliver.log";
+ $log_file{\@common_log_list} = "%COMMON_DEST%/inc/$module/deliver.log";
$file_date{\@log_list} = $logfiledate;
$file_date{\@common_log_list} = $commonlogfiledate;
diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst
index 05ceea2..9972651 100755
--- a/solenv/prj/d.lst
+++ b/solenv/prj/d.lst
@@ -1,4 +1,4 @@
-mkdir: %_DEST%\bin%_EXT%
-mkdir: %_DEST%\inc%_EXT%
-..\inc\version.lst %_DEST%\bin%_EXT%\version.lst
-..\%__SRC%\inc\versionlist.hrc %_DEST%\inc%_EXT%\versionlist.hrc
+mkdir: %_DEST%\bin
+mkdir: %_DEST%\inc
+..\inc\version.lst %_DEST%\bin\version.lst
+..\%__SRC%\inc\versionlist.hrc %_DEST%\inc\versionlist.hrc
diff --git a/soltools/prj/d.lst b/soltools/prj/d.lst
index 970805f..409b94a 100644
--- a/soltools/prj/d.lst
+++ b/soltools/prj/d.lst
@@ -1,11 +1,11 @@
-..\%__SRC%\bin\ldump4.exe %_DEST%\bin%_EXT%\ldump4.exe
-..\%__SRC%\bin\makedepend.exe %_DEST%\bin%_EXT%\makedepend.exe
-..\%__SRC%\bin\makedepend %_DEST%\bin%_EXT%\makedepend
-..\%__SRC%\bin\adjustvisibility %_DEST%\bin%_EXT%\adjustvisibility
-..\%__SRC%\bin\javadep.exe %_DEST%\bin%_EXT%\javadep.exe
-..\%__SRC%\bin\javadep %_DEST%\bin%_EXT%\javadep
-..\%__SRC%\bin\checkdll %_DEST%\bin%_EXT%\checkdll
-..\%__SRC%\bin\cpp.exe %_DEST%\bin%_EXT%\cpplcc.exe
-..\%__SRC%\bin\cpp %_DEST%\bin%_EXT%\cpp.lcc
-..\%__SRC%\inc\unistd.h %_DEST%\inc%_EXT%\unistd.h
-..\%__SRC%\bin\testhxx* %_DEST%\bin%_EXT%\testhxx*
+..\%__SRC%\bin\ldump4.exe %_DEST%\bin\ldump4.exe
+..\%__SRC%\bin\makedepend.exe %_DEST%\bin\makedepend.exe
+..\%__SRC%\bin\makedepend %_DEST%\bin\makedepend
+..\%__SRC%\bin\adjustvisibility %_DEST%\bin\adjustvisibility
+..\%__SRC%\bin\javadep.exe %_DEST%\bin\javadep.exe
+..\%__SRC%\bin\javadep %_DEST%\bin\javadep
+..\%__SRC%\bin\checkdll %_DEST%\bin\checkdll
+..\%__SRC%\bin\cpp.exe %_DEST%\bin\cpplcc.exe
+..\%__SRC%\bin\cpp %_DEST%\bin\cpp.lcc
+..\%__SRC%\inc\unistd.h %_DEST%\inc\unistd.h
+..\%__SRC%\bin\testhxx* %_DEST%\bin\testhxx*
diff --git a/stlport/prj/d.lst b/stlport/prj/d.lst
index fe7c6f3..88478ce 100644
--- a/stlport/prj/d.lst
+++ b/stlport/prj/d.lst
@@ -1,3 +1,3 @@
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
commit 179c5ca39e43fe9e4da77d494b44b87a5722e455
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jun 2 18:31:36 2011 +0300
Drop fairly pointless warning about lack of GTK quickstarter on the Mac
Who would that surprise anyway?
diff --git a/configure.in b/configure.in
index aec87e1..7b21b82 100755
--- a/configure.in
+++ b/configure.in
@@ -1477,11 +1477,7 @@ case "$host_os" in
else
_os=Darwin
fi
- if test "$_os" = "Darwin" -a "$enable_systray" = "yes" -a "$enable_gtk" != "no"; then
- AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
- echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn
- enable_systray=no
- fi
+ enable_systray=no
;;
freebsd*)
test_gtk=yes
commit bb80ae4e9187a4696f38adc00799cde1cab4438d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jun 2 17:32:18 2011 +0300
Better librsvg checks, allow --without-system-libs to override
diff --git a/configure.in b/configure.in
index 2eca92c..aec87e1 100755
--- a/configure.in
+++ b/configure.in
@@ -7930,10 +7930,6 @@ LIBRSVG_LIBS=""
AC_MSG_CHECKING([what librsvg to use])
-if test -z "$enable_librsvg" -a "$with_system_libs" = yes; then
- enable_librsvg=system
-fi
-
case "$enable_librsvg" in
no|disable)
AC_MSG_RESULT([none])
@@ -7941,21 +7937,28 @@ no|disable)
;;
""|yes|auto)
- if test $build_os = cygwin; then
- dnl When building on Windows always use the internal one
- AC_MSG_RESULT([internal])
- enable_librsvg=internal
- elif test $_os = Darwin -o $_os = iOS; then
- dnl Ditto when building for these OSes. Add more OSes above as needed.
+ if test $build_os = cygwin -o \
+ $_os = Darwin -o $_os = iOS; then
+ dnl When building on/for these OSes always use the internal one,
+ dnl if at all. Add more OSes above as needed.
AC_MSG_RESULT([internal])
enable_librsvg=internal
else
- AC_MSG_RESULT([checking further])
- PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14,, [:])
- if test -z "$LIBRSVG_PKG_ERRORS"; then
+ if test "$with_system_libs" = yes; then
+ AC_MSG_RESULT([system])
+ PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14)
enable_librsvg=system
- else
+ elif test "$with_system_libs" = no; then
+ AC_MSG_RESULT([internal])
enable_librsvg=internal
+ else
+ AC_MSG_RESULT([checking further])
+ PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14,, [:])
+ if test -z "$LIBRSVG_PKG_ERRORS"; then
+ enable_librsvg=system
+ else
+ enable_librsvg=internal
+ fi
fi
fi
;;
More information about the Libreoffice-commits
mailing list