bin/verify-custom-widgets-libs | 2 ios/CustomTarget_LibreOffice_app.mk | 6 ios/CustomTarget_MobileLibreOffice_app.mk | 1 ios/Executable_LibreOffice.mk | 1 ios/lo.xcconfig.in | 1 ios/qa/sc/Makefile | 10 ios/qa/sc/filters-test.m | 1 libxmlsec/ExternalProject_xmlsec.mk | 2 postprocess/CustomTarget_signing.mk | 9 smoketest/Executable_libtest.mk | 2 solenv/bin/install-gdb-printers | 38 -- solenv/bin/modules/installer/control.pm | 4 solenv/bin/modules/installer/windows/admin.pm | 4 solenv/bin/modules/installer/windows/msiglobal.pm | 10 solenv/bin/relocate | 290 ---------------------- solenv/gbuild/AllLangResTarget.mk | 2 solenv/gbuild/CppunitTest.mk | 2 solenv/gbuild/ExternalPackage.mk | 2 solenv/gbuild/Helper.mk | 8 19 files changed, 42 insertions(+), 353 deletions(-)
New commits: commit fc68745898647e1b9070459be43c5d1e0e933150 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 31 14:29:01 2013 +0100 verify-custom-widgets-libs: check libraries in instdir Change-Id: Ia46c8df28ad2eed8ccdd6ec00f6bcd8358d8bb26 diff --git a/bin/verify-custom-widgets-libs b/bin/verify-custom-widgets-libs index 8ca2784..3337013 100755 --- a/bin/verify-custom-widgets-libs +++ b/bin/verify-custom-widgets-libs @@ -20,7 +20,7 @@ for foo in $FOO; do lib=$(echo $foo | cut -f1 -d-) symbol=$(echo $foo | cut -f2 -d-) echo testing if lib$lib.so contains make$symbol - nm -D solver/unxlng*/lib/lib$lib.so | grep make$symbol > /dev/null + nm -D instdir/unxlng*/program/lib$lib.so | grep make$symbol > /dev/null if [ $? != 0 ]; then echo "MISSING. Windows will crash" else commit b9120cbb170bac1b82b5e3d4a3ad1369e1526c8b Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 31 14:23:10 2013 +0100 bin unused solver-using perl script Change-Id: Ia2f122904ed6958109b864c487a8a7758d9b959b diff --git a/solenv/bin/relocate b/solenv/bin/relocate deleted file mode 100755 index 19789c7..0000000 --- a/solenv/bin/relocate +++ /dev/null @@ -1,290 +0,0 @@ -: - eval 'exec perl -S $0 ${1+"$@"}' - if 0; -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 . -# -#************************************************************************* -# -# This tool makes it easy to cleanly re-locate a -# build, eg. after you have copied or moved it to a new -# path. It tries to re-write all the hard-coded path logic -# internally. -# - -sub sniff_set($) -{ - my $build_dir = shift; - my ($dirhandle, $fname); - - opendir ($dirhandle, $build_dir) || die "Can't open $build_dir"; - while ($fname = readdir ($dirhandle)) { - $fname =~ /Set.sh$/ && last; - } - closedir ($dirhandle); - - return $fname; -} - -sub sed_file($$$) -{ - my ($old_fname, $function, $state) = @_; - my $tmp_fname = "$old_fname.new"; - my $old_file; - my $new_file; - - open ($old_file, $old_fname) || die "Can't open $old_fname: $!"; - open ($new_file, ">$tmp_fname") || die "Can't open $tmp_fname: $!"; - - while (<$old_file>) { - my $value = &$function($state, $_); - print $new_file $value; - } - - close ($new_file) || die "Failed to close $tmp_fname: $!"; - close ($old_file) || die "Failed to close $old_fname: $!"; - - rename $tmp_fname, $old_fname || die "Failed to replace $old_fname: $!"; -} - -sub rewrite_value($$) -{ - my ($state, $value) = @_; - - $value =~ s/$state->{'old_root'}/$state->{'new_root'}/g; - $value =~ s/$state->{'win32_old_root'}/$state->{'win32_new_root'}/g; - - return $value; -} - -sub rewrite_set($$$) -{ - my $new_root = shift; - my $old_root = shift; - my $set = shift; - my $tmp; - my %state; - - print " $set\n"; - -# unix style - $state{'old_root'} = $old_root; - $state{'new_root'} = $new_root; -# win32 style - $tmp = $old_root; - $tmp =~ s/\//\\\\\\\\\\\\\\\\/g; - $state{'win32_old_root'} = $tmp; - $tmp = $new_root; - $tmp =~ s/\//\\\\\\\\/g; - $state{'win32_new_root'} = $tmp; - - sed_file ("$new_root/$set", \&rewrite_value, \%state); -} - -sub read_set($$) -{ - my $new_root = shift; - my $set = shift; - my $fname = "$new_root/$set"; - my $file; - my %env_keys; - - open ($file, $fname) || die "Can't open $fname: $!"; - - while (<$file>) { - if (/\s*([^=]+)\s*=\s*\"([^\"]+)\"/) { - my ($name, $value) = ($1, $2); - - $env_keys{$name} = $value; - } - } - - close ($file) || die "Failed to close $fname: $!"; - - 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($$$) -{ - my $new_root = shift; - my $product_path = shift; - my $old_root = shift; - - my $path = "$new_root/$product_path/misc"; - my $misc_dir; - opendir ($misc_dir, $path) || return; - my $name; - 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$/) { - sed_file_no_touch ($new_root, $old_root, "$path/$name"); - } - } - closedir ($misc_dir); -} - -sub rewrite_dpcc($$) -{ - my $new_root = shift; - my $old_root = shift; - - my $top_dir; - my $idx = 0; - opendir ($top_dir, $new_root) || die "Can't open $new_root: $!"; - my $name; - while ($name = readdir ($top_dir)) { - my $sub_dir; - opendir ($sub_dir, "$new_root/$name") || next; - my $sub_name; - while ($sub_name = readdir ($sub_dir)) { - if ($sub_name =~ /\.pro$/) { - $idx || print "\n "; - if ($idx++ == 6) { - $idx = 0; - } - print "$name "; - rewrite_product_deps ($new_root, "$name/$sub_name", $old_root); - } - } - closedir ($sub_dir); - } - closedir ($top_dir); - print "\n"; -} - -sub rewrite_symlinks($$) -{ - my $new_root = shift; - my $old_root = shift; - - my $dirh; - opendir ($dirh, $new_root); - while (my $ent = readdir ($dirh)) { - $ent =~ /^\./ && next; - my $link = "$new_root/$ent"; - -l $link || next; - my $target = readlink ($link); - my $newtarget = $target; - $newtarget =~ s/$old_root/$new_root/; - if ($target =~ m/$new_root/) { - print STDERR "skip correct link $target\n"; - } elsif ($newtarget eq $target) { - print STDERR "unusual - possibly stale link: $target\n"; - if ($target =~ m/\/clone\//) { die "failed to rename link"; } - } else { - print "Re-write link $target to $newtarget\n"; - unlink ($link); - symlink ($newtarget, $link); - } - } - closedir ($dirh); -} - -sub rewrite_bootstrap($$) -{ - my $new_root = shift; - my $old_root = shift; - - print " bootstrap\n"; - - my %state; - $state{'old_root'} = $old_root; - $state{'new_root'} = $new_root; - - my $rewrite = sub { my $state = shift; my $value = shift; - $value =~ s/$state->{'old_root'}/$state->{'new_root'}/g; - return $value; }; - sed_file ("$new_root/bootstrap", $rewrite, \%state); - `chmod +x $new_root/bootstrap`; -} - -for $a (@ARGV) { - if ($a eq '--help' || $a eq '-h') { - print "relocate: syntax\n"; - print " relocate /path/to/new/ooo/source_root\n"; - } -} - -$OOO_BUILD = shift (@ARGV) || die "Pass path to relocated source tree"; -substr ($OOO_BUILD, 0, 1) eq '/' || die "relocate requires absolute paths"; - -my $set; - -$set = sniff_set($OOO_BUILD) || die "Can't find env. set"; -my $env_keys = read_set ($OOO_BUILD, $set); -$OLD_ROOT = $env_keys->{'SRC_ROOT'}; -my $solver = $env_keys->{SOLARVER} . "/" . $env_keys->{INPATH}; - -print "Relocate: $OLD_ROOT -> $OOO_BUILD\n"; -if ($OLD_ROOT eq $OOO_BUILD) { - print "nothing to do\n"; - exit 0; -} - -print "re-writing symlinks\n"; -rewrite_symlinks($OOO_BUILD, $OLD_ROOT); - -print "re-writing dependencies:\n"; -rewrite_dpcc($OOO_BUILD, $OLD_ROOT); - -if (-d "$solver/workdir/Dep") { - 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 4a2ecbfa0ef547f7c8e7625b51a9f8369edfe2c3 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 31 14:15:37 2013 +0100 install-gdb-printers: remove obsolete -L option (obsoleted by linkoo removal) Change-Id: I2f1ccc46625b10755795c53850481aaae3b0dc6e diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers index 1b0ff1c..7368856 100755 --- a/solenv/bin/install-gdb-printers +++ b/solenv/bin/install-gdb-printers @@ -8,7 +8,6 @@ # GDBDIR="${SOLARENV}/gdb" -SOLVERLIBDIR="${SOLARVER}/${INPATH}/lib" INSTALLDIR="${TESTINSTALLDIR}" DYLIB=so if [ "$(uname)" = Darwin ]; then @@ -26,7 +25,7 @@ usage() { Install gdb pretty printers and autoloaders for them. Usage: -install-gdb-printers [ -a dir ] [ -i dir ] [ -p dir ] [ -c ] [ -L ] +install-gdb-printers [ -a dir ] [ -i dir ] [ -p dir ] [ -c ] install-gdb-printers -h Options: @@ -38,21 +37,13 @@ Options: used during build. -h Show this help text. -i dir The dir where libreoffice is installed. Defaults to whatever -a is. --L Create symlinks to autoloaders already present in the build tree. - Only makes sense for dev. installation. -p dir The dir where pretty printers are placed. Env. variables: DESTDIR If set, it is prepended to all dir arguments. Examples: -1) Make pretty printers usable in your dev. installation (this is - already done as part of make dev-install, but it would not have been - run if smoketest failed): - -install-gdb-printers -L - -2) Install pretty printers into /usr/share/libreoffice/gdb, with +1) Install pretty printers into /usr/share/libreoffice/gdb, with autoloaders in /usr/share/gdb/auto-load (run "info gdb 'Extending GDB' Python Auto-loading" to learn more) and installation in /usr/lib64/libreoffice (this is what Fedora does): @@ -78,21 +69,13 @@ make_autoload() { mkdir -p "${dir}" || die "cannot create dir '${dir}'" fi - if ${link}; then - if [[ ${dir} != ${SOLVERLIBDIR} ]]; then - local gdbname="${lib##*/}-gdb.py" - [[ -f ${dir}/${gdbname} ]] && rm -f "${dir}/${gdbname}" - ln -s "${SOLVERLIBDIR}/${gdbname}" "${dir}/${gdbname}" - fi + [[ -f ${lib}-gdb.py ]] && rm -f "${lib}-gdb.py" + if [[ -n "${merged}" ]]; then + sed -e "s!%PYTHONDIR%!${pythondir}!" -e "s!%MODULES%!${*:5}!" \ + "${GDBDIR}/autoload.template" > "${lib}-gdb.py" else - [[ -f ${lib}-gdb.py ]] && rm -f "${lib}-gdb.py" - if [[ -n "${merged}" ]]; then - sed -e "s!%PYTHONDIR%!${pythondir}!" -e "s!%MODULES%!${*:5}!" \ - "${GDBDIR}/autoload.template" > "${lib}-gdb.py" - else - sed -e "s!%PYTHONDIR%!${pythondir}!" -e "s!%MODULES%!$1!" \ - "${GDBDIR}/autoload.template" > "${lib}-gdb.py" - fi + sed -e "s!%PYTHONDIR%!${pythondir}!" -e "s!%MODULES%!$1!" \ + "${GDBDIR}/autoload.template" > "${lib}-gdb.py" fi } @@ -106,9 +89,6 @@ pythondir="${GDBDIR}" # Create autoload dir if it does not exist. This only makes sense when # installing into system gdb dir, so $autoloaddir must be absolute path. create=false -# Create symlinks to existing autoloaders in solver. This only makes -# sense for dev-install. -link=false # This option is only here to enable using the script during build of # solenv/gdb . We must (or, better, want to :) avoid using the # installation subpaths (like ure-link), because all libs in solver @@ -124,7 +104,6 @@ while getopts :a:cfhi:p:L opt; do h) usage; exit ;; i) installdir="${OPTARG}" ;; p) pythondir="${OPTARG}" ;; - L) link=true ;; *) die "unknown option ${OPTARG}" ;; esac done @@ -138,7 +117,6 @@ elif [[ -z ${autoloaddir} && -n ${installdir} ]]; then autoloaddir="${installdir}" fi -${create} && ${link} && die "-c and -L cannot be used together" if [[ -n ${DESTDIR} ]]; then [[ ${autoloaddir:0:1} = / ]] || die 'the arg to -a must be an absolute path' [[ ${pythondir:0:1} = / ]] || die 'the arg to -p must be an absolute path' commit b3902b1a1a5097cec393227ba8c57ef936ae4db6 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 31 13:52:16 2013 +0100 postprocess: CustomTarget_signing: find libs in INSTDIR ... not sure if it wouldn't be better to do this directly when linking, but what do i know about this signing stuff anyway... Change-Id: Iabebf21dd8c0198afb4fd03403fca3ca8a0c9b22 diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index 3e2eec4..40f7250 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -33,7 +33,14 @@ ifneq ($(ENABLE_DBGUTIL),TRUE) $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ $(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \ - $(OUTDIR)/bin/*.dll $(OUTDIR)/bin/*.exe \ + $(INSTDIR)/URE/bin/*.dll \ + $(INSTDIR)/URE/bin/*.exe \ + $(INSTDIR)/program/*.dll \ + $(INSTDIR)/program/*.exe \ + $(INSTDIR)/program/shlxthdl/*.dll \ + $(INSTDIR)/sdk/cli/*.dll \ + $(INSTDIR)/sdk/bin/*.exe \ + $(INSTDIR)/share/extensions/mysql-connector-ooo/*.dll\ && touch $@ else @echo "Doing nothing on non product builds ..." commit 663e29ef0ed33646b38d04b9a2a9843e7e1061e3 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 31 13:12:55 2013 +0100 gbuild: gb_Helper_abbreviate_dirs should replace INSTDIR not OUTDIR Change-Id: I17bb3d4efc676f2904ad9e23433a4c98bc2669ad diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk index 21ea693..b80bc11 100644 --- a/solenv/gbuild/ExternalPackage.mk +++ b/solenv/gbuild/ExternalPackage.mk @@ -70,7 +70,7 @@ endef # Set output dir for the package's files. # -# Default is $(OUTDIR). +# Default is $(INSTROOT). # # gb_ExternalPackage_set_outdir package outdir define gb_ExternalPackage_set_outdir diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 535f93e..cbfa04e 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -32,17 +32,17 @@ $(gb_Helper_MISCDUMMY) : ifeq ($(SRCDIR),$(BUILDDIR)) define gb_Helper_abbreviate_dirs S=$(SRCDIR) && \ -$(subst $(SRCDIR)/,$$S/,O=$(OUTDIR)) && \ +$(subst $(SRCDIR)/,$$S/,I=$(INSTDIR)) && \ $(subst $(SRCDIR)/,$$S/,W=$(WORKDIR)) && \ -$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(1)))) +$(subst $(SRCDIR)/,$$S/,$(subst $(INSTDIR)/,$$I/,$(subst $(WORKDIR)/,$$W/,$(1)))) endef else define gb_Helper_abbreviate_dirs S=$(SRCDIR) && \ $(subst $(SRCDIR)/,$$S/,B=$(BUILDDIR)) && \ -$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,O=$(OUTDIR))) && \ +$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,I=$(INSTDIR))) && \ $(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,W=$(WORKDIR))) && \ -$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(1))))) +$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,$(subst $(INSTDIR)/,$$I/,$(subst $(WORKDIR)/,$$W/,$(1))))) endef endif commit 3b4a9ade6bfb8c3561929be0ad1d840285f412db Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 31 13:09:45 2013 +0100 gbuild; CppunitTest: use INSTDIR in add-auto-load-safe-path Change-Id: Id9520beb1b50d580b6331c7a554794d88775faab diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 5fe8e95..21b828f 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -27,7 +27,7 @@ printf '\nError: a unit test failed, please do one of:\n\nexport DEBUGCPPUNIT=TR endef ifeq ($(strip $(DEBUGCPPUNIT)),TRUE) -gb_CppunitTest_GDBTRACE := gdb -nx -ex "add-auto-load-safe-path $(OUTDIR)/lib" --command=$(SOLARENV)/bin/gdbtrycatchtrace-stdout -return-child-result --args +gb_CppunitTest_GDBTRACE := gdb -nx -ex "add-auto-load-safe-path $(INSTDIR)" --command=$(SOLARENV)/bin/gdbtrycatchtrace-stdout -return-child-result --args else ifneq ($(strip $(CPPUNITTRACE)),) gb_CppunitTest_GDBTRACE := $(CPPUNITTRACE) gb_CppunitTest__interactive := $(true) commit 478887c52325fb7f723e03f664eea5fa833bf6b8 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 31 13:07:03 2013 +0100 gbuild: stop creating OUTDIR/bin in ResTarget Change-Id: Ic708402d7d5c8d5065dc27d88c1dcb271e925770 diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index e809a07..5bd285c 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -376,7 +376,7 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \ $(gb_ResTarget_RSCDEPS) $(call gb_Output_announce,$*,$(true),RES,2) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $@) $(OUTDIR)/bin \ + mkdir -p $(dir $@) \ $(dir $(call gb_ResTarget_get_imagelist_target,$*)) && \ RESPONSEFILE=`$(gb_MKTEMP)` && \ echo "-r -p \ commit 8c592206178f72f852cec3f54fba501f2030b154 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 31 13:04:44 2013 +0100 installer: replace usage of OUTDIR Change-Id: I82a87bdde9751efbdcfb4da5f89ba10ac17b427b diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 573f731..deea124 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -73,7 +73,7 @@ sub check_system_path if ($ENV{'CROSS_COMPILING'} eq 'YES') { # we build our own msi* etc. tools when cross-compiling - $ENV{'PATH'} .= $installer::globals::pathseparator . $ENV{'OUTDIR_FOR_BUILD'} . '/bin'; + $ENV{'PATH'} .= $installer::globals::pathseparator . $ENV{'WORKDIR_FOR_BUILD'} . '/LinkTarget/Executable'; } my $onefile; @@ -169,7 +169,7 @@ sub get_makecab_version my $systemcall = "makecab.exe |"; if ( $installer::globals::isunix ) { - $systemcall = "$ENV{'OUTDIR_FOR_BUILD'}/bin/makecab.exe |"; + $systemcall = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/makecab.exe |"; } my @makecaboutput = (); diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm index e5b199d..6fb1858 100644 --- a/solenv/bin/modules/installer/windows/admin.pm +++ b/solenv/bin/modules/installer/windows/admin.pm @@ -102,7 +102,7 @@ sub extract_tables_from_pcpfile my $msidb = "msidb.exe"; # Has to be in the path if ( $installer::globals::isunix ) { - $msidb = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe"; + $msidb = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/msidb.exe"; } my $infoline = ""; my $systemcall = ""; @@ -407,7 +407,7 @@ sub write_sis_info my $msiinfo = "msiinfo.exe"; # Has to be in the path if ( $installer::globals::isunix ) { - $msiinfo = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msiinfo.exe"; + $msiinfo = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/msiinfo.exe"; } my $infoline = ""; my $systemcall = ""; diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index 492b4a7..18366eb 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -251,7 +251,7 @@ sub generate_cab_file_list my $oneline = "makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n"; if ( $installer::globals::isunix ) { - $oneline = "$ENV{'OUTDIR_FOR_BUILD'}/bin/makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n"; + $oneline = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n"; } push(@cabfilelist, $oneline); @@ -331,7 +331,7 @@ sub generate_cab_file_list my $oneline = "makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n"; if ( $installer::globals::isunix ) { - $oneline = "$ENV{'OUTDIR_FOR_BUILD'}/bin/makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n"; + $oneline = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n"; } push(@cabfilelist, $oneline); @@ -460,7 +460,7 @@ sub create_msi_database my $msidb = "msidb.exe"; # Has to be in the path if ( $installer::globals::isunix ) { - $msidb = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe"; + $msidb = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/msidb.exe"; } my $extraslash = ""; # Has to be set for non-ActiveState perl @@ -615,7 +615,7 @@ sub write_summary_into_msi_database my $msiinfo = "msiinfo.exe"; # Has to be in the path if ( $installer::globals::isunix ) { - $msiinfo = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msiinfo.exe"; + $msiinfo = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/msiinfo.exe"; } my $msiversion = get_msiversion_for_sis(); @@ -1151,7 +1151,7 @@ sub include_cabs_into_msi my $msidb = "msidb.exe"; # Has to be in the path if ( $installer::globals::isunix ) { - $msidb = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe"; + $msidb = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/msidb.exe"; } my $extraslash = ""; # Has to be set for non-ActiveState perl commit 7c8036b9d021833c7268e4a03b29b2a52da535d2 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 31 12:59:34 2013 +0100 smoketest: replace usage of OUTDIR Change-Id: I6629fb0a5312572c5a32876b19e71312761c98f1 diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk index dfab98d..14bf342 100644 --- a/smoketest/Executable_libtest.mk +++ b/smoketest/Executable_libtest.mk @@ -37,6 +37,6 @@ $(liblibreoffice_OWN_LD_SO) : $(call gb_Library_get_target,libreoffice) run_libtest: $(liblibreoffice_OWN_LD_SO) $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(liblibreoffice_OWN_LD_PATH_DIR)/Library" \ $(WORKDIR)/LinkTarget/Executable/libtest \ - $(INSTROOT)/program $(OUTDIR)/bin/smoketestdoc.sxw \ + $(INSTROOT)/program $(WORKDIR)/Zip/smoketestdoc.sxw \ # vim: set noet sw=4 ts=4: commit 2ba6873511df2fa822d0f63ee90b271e4daf1e9b Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 31 12:50:51 2013 +0100 libxmlsec: replace use of OUTDIR (not sure if it's correct) Change-Id: Ie517bb93b34e132539cbe312dd13f30dcc4a0c9f diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index 7a0fcb6..dc79899 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -55,7 +55,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : autoreconf \ && ./configure \ --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \ - $(if $(filter ANDROID,$(OS)),$(if $(DISABLE_OPENSSL),--without-openssl,--with-openssl=$(OUTDIR))) \ + $(if $(filter ANDROID,$(OS)),$(if $(DISABLE_OPENSSL),--without-openssl,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl))) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ commit 2757fcea22147e2c20095058333f4cdef8f83081 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 31 12:41:13 2013 +0100 ios: convert usage of OUTDIR ... not sure if it's always correct but... Change-Id: Iccb21bace96825cbf502ae37fc513bbe76d261e3 diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk index 9ba7dec..7ec5034 100644 --- a/ios/CustomTarget_LibreOffice_app.mk +++ b/ios/CustomTarget_LibreOffice_app.mk @@ -53,9 +53,9 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) # # Copy rdb files # - cp $(OUTDIR)/bin/offapi.rdb $(appdir) - cp $(OUTDIR)/bin/udkapi.rdb $(appdir) - cp $(OUTDIR)/bin/oovbaapi.rdb $(appdir) + cp $(INSTDIR)/ure/share/misc/types.rdb $(appdir) + cp $(INSTDIR)/program/types/offapi.rdb $(appdir) + cp $(INSTDIR)/program/types/oovbaapi.rdb $(appdir) cp $(INSTDIR)/program/services/services.rdb $(appdir) cp $(INSTDIR)/ure/share/misc/services.rdb $(appdir)/ure # diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk index 64b66a1..300d67f 100644 --- a/ios/CustomTarget_MobileLibreOffice_app.mk +++ b/ios/CustomTarget_MobileLibreOffice_app.mk @@ -48,7 +48,6 @@ MobileLibreOffice_setup: # Libs # # Create the link flags in the xcconfig for Xcode linkage for path in $(INSTDIR)/program \ - $(WORKDIR)/Headers/Library \ $(WORKDIR)/LinkTarget/StaticLibrary \ $(WORKDIR)/UnpackedTarball/*/.libs \ $(WORKDIR)/UnpackedTarball/*/src/.libs \ diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk index 2db76dc..05477b9 100644 --- a/ios/Executable_LibreOffice.mk +++ b/ios/Executable_LibreOffice.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Executable_add_objcobjects,LibreOffice,\ # variable for that list? (To be used for Android builds, too.) $(WORKDIR)/LinkTarget/Executable/LibreOffice : \ - $(wildcard $(OUTDIR)/lib/lib*.a) \ $(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \ $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in index 3bdc79a..91278bc 100644 --- a/ios/lo.xcconfig.in +++ b/ios/lo.xcconfig.in @@ -14,7 +14,6 @@ LO_BUILDDIR = @BUILDDIR@ LO_INSTDIR = @INSTDIR@ -LO_OUTDIR = @OUTDIR@ LO_SRCDIR = @SRC_ROOT@ LO_WORKDIR = @WORKDIR@ diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile index 5eb1cb3..0e7dc78 100644 --- a/ios/qa/sc/Makefile +++ b/ios/qa/sc/Makefile @@ -39,7 +39,7 @@ SRCS = filters-test.m CFLAGS = $(SOLARINC) -LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/fastsax.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -llcms2 -lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nlangtaggcc3 -li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -ltllo -l ucb1 -lucbhelper4gcc3 -lucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc +LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/fastsax.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -llcms2 -lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nlangtaggcc3 -li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -l ucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc all: $(APPDIR)/$(APP) stuff @@ -73,14 +73,12 @@ stuff: # hmm, once again, a hodgepodge of stuff, I don't really know which # files of which are actually needed... mkdir -p $(APPDIR)/registry/res - cp $(OUTDIR)/xml/*.xcd $(APPDIR)/registry mv $(APPDIR)/registry/fcfg_langpack_en-US.xcd $(APPDIR)/registry/res - cp -R $(OUTDIR)/xml/registry/* $(APPDIR)/registry # # .rdb files - cp $(OUTDIR)/bin/udkapi.rdb $(OUTDIR)/bin/types.rdb $(OUTDIR)/xml/ure/services.rdb $(APPDIR) + cp $(INSTDIR)/ure/share/misc/types.rdb $(INSTDIR)/program/types/offapi.rdb $(INSTDIR)/program/services/services.rdb $(APPDIR) mkdir -p $(APPDIR)/ure - cp $(OUTDIR)/bin/ure/types.rdb $(APPDIR)/ure + cp $(INSTDIR)/ure/share/misc/types.rdb $(APPDIR)/ure # # a bunch of .component files for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml configmgr/source/configmgr basic/util/sb chart2/source/controller/chartcontroller chart2/source/chartcore comphelper/util/comphelp eventattacher/source/evtatt filter/source/config/cache/filterconfig1 oox/util/oox package/source/xstor/xstor package/util/package2 sax/source/expatwrap/expwrap sax/source/fastparser/fastsax sc/util/sc sc/util/scfilt scaddins/source/analysis/analysis scaddins/source/datefunc/date sot/util/sot svl/util/svl toolkit/util/tk ucb/source/ucp/tdoc/ucptdoc1 unotools/util/utl unoxml/source/rdf/unordf; do \ @@ -94,7 +92,7 @@ stuff: # ResMgrContainer::init() in tools/source/rc/resmgr.cxx, so let's use # that. mkdir -p $(APPDIR)/program/resource - for F in $(OUTDIR)/bin/*.res; do \ + for F in $(INSTDIR)/program/resource/*.res; do \ cp $$F $(APPDIR)/program/resource; \ done # diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m index 84e5bf5..b664a39 100644 --- a/ios/qa/sc/filters-test.m +++ b/ios/qa/sc/filters-test.m @@ -82,7 +82,6 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions // See unotest/source/cpp/bootstrapfixturebase.cxx const char *app_root = [[[NSBundle mainBundle] bundlePath] UTF8String]; setenv("SRC_ROOT", app_root, 1); - setenv("OUTDIR_FOR_BUILD", app_root, 1); setenv("SAL_LOG", "yes", 1); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits