[Libreoffice-commits] .: 985 commits - buildscript.sh configure.in git-hooks/pre-commit .gitignore GNUmakefile.mk instsetoo_native/inc_openoffice instsetoo_native/prj instsetoo_native/util Makefile.in Module_ooo.mk ooo.lst RepositoryFixes.mk Repository.mk scp2/inc scp2/prj scp2/source set_soenv.in soldep/bootstrp soldep/inc solenv/bin solenv/config solenv/doc solenv/gbuild solenv/inc solenv/makefile.mk solenv/prj solenv/src soltools/HIDCompiler soltools/mkdepend soltools/prj stlport/systemstlguards
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Mar 18 08:20:04 PDT 2011
.gitignore | 399 -
GNUmakefile.mk | 37
Makefile.in | 46
Module_ooo.mk | 47
Repository.mk | 131
RepositoryFixes.mk | 159
buildscript.sh | 18
configure.in | 129
git-hooks/pre-commit | 7
instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk | 5
instsetoo_native/prj/build.lst | 2
instsetoo_native/prj/d.lst | 1
instsetoo_native/util/makefile.mk | 1
instsetoo_native/util/openoffice.lst | 89
ooo.lst | 22
scp2/inc/macros.inc | 86
scp2/prj/build.lst | 2
scp2/source/base/file_base.scp | 14
scp2/source/binfilter/file_binfilter.scp | 6
scp2/source/calc/file_calc.scp | 12
scp2/source/calc/registryitem_calc.scp | 4
scp2/source/canvas/cairocanvas.scp | 3
scp2/source/canvas/canvascommons.scp | 4
scp2/source/canvas/directxcanvas.scp | 6
scp2/source/canvas/vclcanvas.scp | 2
scp2/source/draw/registryitem_draw.scp | 6
scp2/source/gnome/file_gnome.scp | 6
scp2/source/graphicfilter/file_graphicfilter.scp | 4
scp2/source/impress/file_impress.scp | 4
scp2/source/impress/module_ogltrans.scp | 3
scp2/source/impress/registryitem_impress.scp | 8
scp2/source/javafilter/file_javafilter.scp | 2
scp2/source/javafilter/registryitem_javafilter.scp | 8
scp2/source/kde/file_kde.scp | 4
scp2/source/math/file_math.scp | 4
scp2/source/onlineupdate/file_onlineupdate.scp | 2
scp2/source/ooo/common_brand.scp | 11
scp2/source/ooo/directory_ooo_macosx.scp | 4
scp2/source/ooo/file_improvement.scp | 2
scp2/source/ooo/file_library_ooo.scp | 405 -
scp2/source/ooo/file_ooo.scp | 95
scp2/source/ooo/file_resource_ooo.scp | 9
scp2/source/ooo/makefile.mk | 10
scp2/source/ooo/module_hidden_ooo.scp | 4
scp2/source/ooo/module_lang_template.scp | 9
scp2/source/ooo/module_langpack.ulf | 8
scp2/source/ooo/ooo_brand.scp | 8
scp2/source/ooo/profileitem_ooo.scp | 22
scp2/source/ooo/ure.scp | 138
scp2/source/python/file_python.scp | 4
scp2/source/python/module_python_mailmerge.scp | 3
scp2/source/testtool/file_testtool.scp | 7
scp2/source/writer/file_writer.scp | 14
scp2/source/writer/registryitem_writer.scp | 14
set_soenv.in | 44
soldep/bootstrp/command.cxx | 683 ++
soldep/bootstrp/sstring.cxx | 314
soldep/inc/soldep/command.hxx | 163
soldep/inc/soldep/listmacr.hxx | 60
soldep/inc/soldep/sstring.hxx | 105
solenv/bin/build.pl | 800 +-
solenv/bin/buildalyzer | 138
solenv/bin/createcomponent.xslt | 51
solenv/bin/deliver.pl | 32
solenv/bin/linkoo | 22
solenv/bin/macosx-change-install-names.pl | 12
solenv/bin/macosx-create-bundle | 2
solenv/bin/make_installer.pl | 42
solenv/bin/mhids.pl | 384 -
solenv/bin/modules/CreatePDBRelocators.pm | 61
solenv/bin/modules/RepositoryHelper.pm | 20
solenv/bin/modules/SourceConfig.pm | 35
solenv/bin/modules/SourceConfigHelper.pm | 422 +
solenv/bin/modules/installer/control.pm | 32
solenv/bin/modules/installer/environment.pm | 4
solenv/bin/modules/installer/globals.pm | 20
solenv/bin/modules/installer/parameter.pm | 15
solenv/bin/modules/installer/regmerge.pm | 339 -
solenv/bin/modules/installer/scriptitems.pm | 82
solenv/bin/modules/installer/servicesfile.pm | 1059 ---
solenv/bin/modules/installer/simplepackage.pm | 40
solenv/bin/modules/installer/substfilenamefiles.pm | 5
solenv/bin/modules/installer/windows/component.pm | 16
solenv/bin/modules/installer/windows/directory.pm | 107
solenv/bin/modules/installer/windows/file.pm | 234
solenv/bin/modules/installer/windows/idtglobal.pm | 24
solenv/bin/modules/installer/windows/msiglobal.pm | 110
solenv/bin/modules/installer/windows/property.pm | 4
solenv/bin/modules/par2script/check.pm | 49
solenv/bin/packcomponents.xslt | 52
solenv/bin/packmodule | 63
solenv/bin/par2script.pl | 2
solenv/bin/subsequenttests | 54
solenv/bin/transform_description.pl | 6
solenv/config/sdev300.ini | 3358 ++++++++++
solenv/doc/gbuild/doxygen.cfg | 1510 ++++
solenv/doc/gbuild/solenv/gbuild/alllangres.mk | 90
solenv/doc/gbuild/solenv/gbuild/executable.mk | 25
solenv/doc/gbuild/solenv/gbuild/gbuild.mk | 82
solenv/doc/gbuild/solenv/gbuild/helper.mk | 42
solenv/doc/gbuild/solenv/gbuild/library.mk | 41
solenv/doc/gbuild/solenv/gbuild/linktarget.mk | 128
solenv/doc/gbuild/solenv/gbuild/package.mk | 30
solenv/doc/gbuild/solenv/gbuild/sdi.mk | 23
solenv/doc/gbuild/solenv/gbuild/static_library.mk | 39
solenv/doc/gbuild/solenv/gbuild/types.mk | 169
solenv/gbuild/AllLangResTarget.mk | 323
solenv/gbuild/BuildDirs.mk | 59
solenv/gbuild/ComponentTarget.mk | 69
solenv/gbuild/CppunitTest.mk | 96
solenv/gbuild/CustomTarget.mk | 96
solenv/gbuild/Deliver.mk | 95
solenv/gbuild/Executable.mk | 91
solenv/gbuild/Helper.mk | 175
solenv/gbuild/JavaClassSet.mk | 81
solenv/gbuild/JunitTest.mk | 97
solenv/gbuild/Library.mk | 133
solenv/gbuild/LinkTarget.mk | 641 +
solenv/gbuild/Module.mk | 212
solenv/gbuild/Output.mk | 147
solenv/gbuild/Package.mk | 80
solenv/gbuild/PrecompiledHeaders.mk | 77
solenv/gbuild/SdiTarget.mk | 71
solenv/gbuild/StaticLibrary.mk | 109
solenv/gbuild/TargetLocations.mk | 162
solenv/gbuild/Tempfile.mk | 18
solenv/gbuild/extensions/post_PackModule.mk | 62
solenv/gbuild/extensions/post_SetupLocal.mk | 68
solenv/gbuild/extensions/pre_SharedLangList.mk | 38
solenv/gbuild/gbuild.mk | 261
solenv/gbuild/platform/linux.mk | 406 +
solenv/gbuild/platform/macosx.mk | 449 +
solenv/gbuild/platform/solaris.mk | 378 +
solenv/gbuild/platform/windows.mk | 678 ++
solenv/gbuild/platform/winmingw.mk | 605 +
solenv/gbuild/processdelivered.awk | 36
solenv/gbuild/processdeps.awk | 78
solenv/gbuild/templates/AllLangResTarget.mk | 49
solenv/gbuild/templates/CppunitTest.mk | 41
solenv/gbuild/templates/Executable.mk | 45
solenv/gbuild/templates/JunitTest.mk | 49
solenv/gbuild/templates/Library.mk | 86
solenv/gbuild/templates/Makefile | 38
solenv/gbuild/templates/Module.mk | 45
solenv/gbuild/templates/Package.mk | 42
solenv/gbuild/templates/StaticLibrary.mk | 35
solenv/gbuild/templates/makefile.mk | 40
solenv/inc/_cppunit.mk | 20
solenv/inc/_tg_rslb.mk | 160
solenv/inc/_tg_scp.mk | 20
solenv/inc/_tg_sdi.mk | 90
solenv/inc/_tg_shl.mk | 170
solenv/inc/_tg_srs.mk | 140
solenv/inc/cppunit.mk | 2
solenv/inc/extension_post.mk | 15
solenv/inc/installationtest.mk | 39
solenv/inc/javaunittest.mk | 27
solenv/inc/langlist.mk | 163
solenv/inc/libs.mk | 6
solenv/inc/minor.mk | 10
solenv/inc/postmac.h | 6
solenv/inc/postwin.h | 15
solenv/inc/premac.h | 6
solenv/inc/prewin.h | 10
solenv/inc/pstrules.mk | 21
solenv/inc/rules.mk | 7
solenv/inc/settings.mk | 99
solenv/inc/target.mk | 58
solenv/inc/tg_ext.mk | 4
solenv/inc/tg_jar.mk | 12
solenv/inc/tg_java.mk | 11
solenv/inc/tg_rslb.mk | 16
solenv/inc/tg_scp.mk | 2
solenv/inc/tg_sdi.mk | 9
solenv/inc/tg_shl.mk | 17
solenv/inc/tg_srs.mk | 14
solenv/inc/unitools.mk | 6
solenv/inc/unx.mk | 3
solenv/inc/unxgcc.mk | 9
solenv/inc/unxmacx.mk | 5
solenv/inc/version.hrc | 16
solenv/inc/version.lst | 6
solenv/inc/version_so.hrc | 16
solenv/inc/versionlist.mk | 2
solenv/inc/wntgcci.mk | 4
solenv/inc/wntmsc.mk | 3
solenv/makefile.mk | 13
solenv/prj/d.lst | 6
solenv/src/component.map | 1
solenv/src/reg-component.map | 8
solenv/src/unloadablecomponent.map | 1
soltools/HIDCompiler/hidclex.l | 949 --
soltools/HIDCompiler/makefile.mk | 63
soltools/HIDCompiler/wrap_hidclex.cxx | 34
soltools/mkdepend/def.h | 4
soltools/mkdepend/include.c | 21
soltools/prj/build.lst | 1
soltools/prj/d.lst | 2
stlport/systemstlguards/postextstl.h | 37
stlport/systemstlguards/preextstl.h | 77
200 files changed, 16743 insertions(+), 5368 deletions(-)
New commits:
commit 377f9f1aa9b4f6f18b889f443e149a08569363bd
Merge: 973fa8a... 8a4d66d...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Mar 18 16:03:09 2011 +0100
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap
commit 973fa8afb1f973fb17efda34da68ec5488a87c4b
Merge: 2589385... 4fbace5...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Mar 17 16:06:07 2011 +0100
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
set_soenv.in
diff --cc ooo.lst
index d7b5356,0f7e5a8..a036503
--- a/ooo.lst
+++ b/ooo.lst
@@@ -43,12 -41,10 +39,9 @@@ af3c3acf618de6108d65fcdc92b492e1-common
bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
- d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz
d1a3205871c3c52e8a50c9f18510ae12-libformula.zip
-d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
- dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip
dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz
e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
@@@ -64,8 -58,18 +55,19 @@@ fdb27bfe2dbe2e7b57ae194d9bf36bab-Sample
37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip
831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
+ 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
http://download.go-oo.org/src
+314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz
47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2
90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
diff --cc scp2/source/python/module_python_mailmerge.scp
index b14162c,ec3a40c..ee92ef1
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@@ -33,8 -32,6 +33,7 @@@ File gid_File_Pymailmerg
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Name = "mailmerge.py";
- RegistryID = gid_Starregistry_Services_Rdb;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED);
End
#endif
+#endif
diff --cc set_soenv.in
index d103a06,b1b3cc0..1e278c3
--- a/set_soenv.in
+++ b/set_soenv.in
@@@ -74,8 -74,8 +74,8 @@@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $I
# Environment variables.
my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
- $UPD, $WORK_STAMP,
- $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, $SOLARDEFIMG,
- $UPD, $WORK_STAMP, $SOURCE_ROOT_DIR , $gb_REPOS, $BUILD_TYPE,
++ $UPD, $WORK_STAMP, $gb_REPOS, $BUILD_TYPE,
+ $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, $SOLARENV, $SOLARDEFIMG,
$STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI,
$DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
$MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
@@@ -1981,6 -2006,9 +2006,8 @@@ if ($platform !~ m/cygwin|os2/)
}
}
ToFile( "SOLARSRC", $SOLARSRC, "e" );
-ToFile( "SOURCE_ROOT_DIR", $SOURCE_ROOT_DIR, "e" );
+ ToFile( "gb_REPOS", $gb_REPOS, "e" );
+
if ( $platform =~ m/cygwin/ )
{
ToFile( "ILIB", $ILIB, "e" );
diff --cc soldep/bootstrp/command.cxx
index 0000000,4766d73..cb2a1c7
mode 000000,100644..100644
--- a/soldep/bootstrp/command.cxx
+++ b/soldep/bootstrp/command.cxx
@@@ -1,0 -1,683 +1,683 @@@
-/*************************************************************************
++/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+ #ifdef SCO
+ #define _IOSTREAM_H
+ #endif
+
+ #include <tools/fsys.hxx>
+ #include <tools/stream.hxx>
+ #include "soldep/command.hxx"
+ #include <tools/debug.hxx>
+ #include <soldep/appdef.hxx>
+
+ #ifdef _MSC_VER
+ #pragma warning (push,1)
+ #endif
+
+ #include <iostream>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <errno.h>
+
+ #ifdef _MSC_VER
+ #pragma warning (pop)
+ #endif
+
+ //#define MH_TEST2 1 // fuers direkte Testen
+
+ #if defined(WNT) || defined(OS2)
+ #ifdef _MSC_VER
+ #pragma warning (push,1)
+ #endif
+ #include <process.h> // for _SPAWN
+ #ifdef _MSC_VER
+ #pragma warning (pop)
+ #endif
+ #endif
+ #ifdef UNX
+ #include <sys/types.h>
+ #include <unistd.h>
+ #if ( defined NETBSD ) || defined (FREEBSD) || defined (AIX) \
+ || defined (HPUX) || defined (MACOSX)
+ #include <sys/wait.h>
+ #else
+ #include <wait.h>
+ #endif
+ #define P_WAIT 1 // erstmal einen dummz
+ #endif
+
+ #if defined WNT
+ #include <tools/svwin.h>
+ #endif
+
+ #if defined(WNT) || defined(OS2)
+ #define cPathSeperator ';'
+ #endif
+ #ifdef UNX
+ #define cPathSeperator ':'
+ #endif
+
+ /*****************************************************************************/
+ CommandLine::CommandLine(sal_Bool bWrite)
+ /*****************************************************************************/
+ : bTmpWrite(bWrite)
+ {
+ CommandBuffer = new char [1];
+ if (CommandBuffer == NULL) {
+ //cout << "Error: nospace" << endl;
+ exit(0);
+ }
+ CommandBuffer[0] = '\0';
+ nArgc = 0;
+ ppArgv = new char * [1];
+ ppArgv[0] = NULL;
+
+ ComShell = new char [128];
+ char* pTemp = getenv("COMMAND_SHELL");
+ if(!pTemp)
+ strcpy(ComShell,COMMAND_SHELL);
+ else
+ strcpy(ComShell,pTemp);
+
+ strcpy(&ComShell[strlen(ComShell)]," -C ");
+ }
+
+ /*****************************************************************************/
+ CommandLine::CommandLine(const char *CommandString, sal_Bool bWrite)
+ /*****************************************************************************/
+ : bTmpWrite(bWrite)
+ {
+ CommandBuffer = new char [1];
+ if (CommandBuffer == NULL) {
+ //cout << "Error: nospace" << endl;
+ exit(0);
+ }
+ nArgc = 0;
+ ppArgv = new char * [1];
+ ppArgv[0] = NULL;
+
+ ComShell = new char [128];
+ char* pTemp = getenv("COMMAND_SHELL");
+ if(!pTemp)
+ strcpy(ComShell,COMMAND_SHELL);
+ else
+ strcpy(ComShell,pTemp);
+
+ strcpy(&ComShell[strlen(ComShell)]," -C ");
+
+ BuildCommand(CommandString);
+ }
+
+ /*****************************************************************************/
+ CommandLine::CommandLine(const CommandLine& CCommandLine, sal_Bool bWrite)
+ /*****************************************************************************/
+ : bTmpWrite(bWrite)
+ {
+ CommandBuffer = new char [1];
+ if (CommandBuffer == NULL) {
+ //cout << "Error: nospace" << endl;
+ exit(0);
+ }
+ nArgc = 0;
+ ppArgv = new char * [1];
+ ppArgv[0] = NULL;
+
+ ComShell = new char [128];
+ char* pTemp = getenv("COMMAND_SHELL");
+ if(!pTemp)
+ strcpy(ComShell,COMMAND_SHELL);
+ else
+ strcpy(ComShell,pTemp);
+
+ strcpy(&ComShell[strlen(ComShell)]," -C ");
+
+ BuildCommand(CCommandLine.CommandBuffer);
+ }
+
+ /*****************************************************************************/
+ CommandLine::~CommandLine()
+ /*****************************************************************************/
+ {
+ delete [] CommandBuffer;
+ delete [] ComShell;
+ //for (int i = 0; ppArgv[i] != '\0'; i++) {
+ for (int i = 0; ppArgv[i] != 0; i++) {
+ delete [] ppArgv[i];
+ }
+ delete [] ppArgv;
+
+ }
+
+ /*****************************************************************************/
+ CommandLine& CommandLine::operator=(const CommandLine& CCommandLine)
+ /*****************************************************************************/
+ {
+ strcpy (CommandBuffer, CCommandLine.CommandBuffer);
+ for (int i = 0; i != nArgc; i++) {
+ delete [] ppArgv[i];
+ }
+ delete [] ppArgv;
+ ppArgv = new char * [1];
+ ppArgv[0] = NULL;
+ BuildCommand(CommandBuffer);
+ return *this;
+ }
+
+ /*****************************************************************************/
+ CommandLine& CommandLine::operator=(const char *CommandString)
+ /*****************************************************************************/
+ {
+ strcpy (CommandBuffer, CommandString);
+ for (int i = 0; i != nArgc; i++) {
+ delete [] ppArgv[i];
+ }
+ delete [] ppArgv;
+ ppArgv = new char * [1];
+ ppArgv[0] = NULL;
+ BuildCommand(CommandBuffer);
+
+ return *this;
+ }
+
+ /*****************************************************************************/
+ void CommandLine::Print()
+ /*****************************************************************************/
+ {
+ //cout << "******* start print *******" << endl;
+ //cout << "nArgc = " << nArgc << endl;
+ //cout << "CommandBuffer = " << CommandBuffer << endl;
+ for (int i = 0; ppArgv[i] != NULL; i++) {
+ //cout << "ppArgv[" << i << "] = " << ppArgv[i] << endl;
+ }
+ //cout << "******** end print ********" << endl;
+ }
+
+ /*****************************************************************************/
+ void CommandLine::BuildCommand(const char *CommandString)
+ /*****************************************************************************/
+ {
+ int index = 0, pos=0;
+ char buffer[1024];
+ char WorkString[1024];
+
+ strcpy(WorkString,CommandString);
+
+ //falls LogWindow -> in tmpfile schreiben
+ if(bTmpWrite)
+ {
+ strcpy(&WorkString[strlen(WorkString)]," >&");
+ strcpy(&WorkString[strlen(WorkString)],getenv("TMP"));
+ strcpy(&WorkString[strlen(WorkString)],TMPNAME);
+ }
+
+ // delete old memory and get some new memory for CommandBuffer
+
+ delete [] CommandBuffer;
+ CommandBuffer = new char [strlen(ComShell)+strlen(WorkString)+1];
+ if (CommandBuffer == NULL) {
+ //cout << "Error: nospace" << endl;
+ exit(0);
+ }
+ strcpy (CommandBuffer, ComShell);
+ strcpy (&CommandBuffer[strlen(ComShell)], WorkString);
+
+ CommandString = CommandBuffer;
+
+ // get the number of tokens
+ Strtokens(CommandString);
+
+ // delete the space for the old CommandLine
+
+ for (int i = 0; ppArgv[i] != 0; i++) {
+ delete [] ppArgv[i];
+ }
+ delete [] ppArgv;
+
+ /* get space for the new command line */
+
+ ppArgv = (char **) new char * [nArgc+1];
+ if (ppArgv == NULL) {
+ //cout << "Error: no space" << endl;
+ exit(0);
+ }
+
+ // flush the white space
+
+ while ( isspace(*CommandString) )
+ CommandString++;
+
+ index = 0;
+
+ // start the loop to build all the individual tokens
+
+ while (*CommandString != '\0') {
+
+ pos = 0;
+
+ // copy the token until white space is found
+
+ while ( !isspace(*CommandString) && *CommandString != '\0') {
+
+ buffer[pos++] = *CommandString++;
+
+ }
+
+ buffer[pos] = '\0';
+
+ // get space for the individual tokens
+
+ ppArgv[index] = (char *) new char [strlen(buffer)+1];
+ if (ppArgv[index] == NULL) {
+ //cout << "Error: nospace" << endl;
+ exit(0);
+ }
+
+ // copy the token
+
+ strcpy (ppArgv[index++], buffer);
+
+ // flush while space
+
+ while ( isspace(*CommandString) )
+ CommandString++;
+
+ }
+
+ // finish by setting the las pointer to NULL
+ ppArgv[nArgc]= NULL;
+
+ }
+
+ /*****************************************************************************/
+ void CommandLine::Strtokens(const char *CommandString)
+ /*****************************************************************************/
+ {
+ int count = 0;
+ const char *temp;
+
+ temp = CommandString;
+
+ /* bypass white space */
+
+ while (isspace(*temp)) temp++;
+
+ for (count=0; *temp != '\0'; count++) {
+
+ /* continue until white space of string terminator is found */
+
+ while ((!isspace(*temp)) && (*temp != '\0')) temp++;
+
+ /* bypass white space */
+
+ while (isspace(*temp)) temp++;
+
+ }
+ nArgc = count;
+ }
+
+ /*****************************************************************************/
+ CCommand::CCommand( ByteString &rString )
+ /*****************************************************************************/
+ {
+ rString.SearchAndReplace( '\t', ' ' );
+ aCommand = rString.GetToken( 0, ' ' );
+ aCommandLine = Search( "PATH" );
+ #ifndef UNX
+ aCommandLine += " /c ";
+ #else
+ aCommandLine += " -c ";
+ #endif
+
+ ByteString sCmd( rString.GetToken( 0, ' ' ));
+ ByteString sParam( rString.Copy( sCmd.Len()));
+
+ aCommandLine += Search( "PATH", sCmd );
+ aCommandLine += sParam;
+
+ ImplInit();
+ }
+
+ /*****************************************************************************/
+ CCommand::CCommand( const char *pChar )
+ /*****************************************************************************/
+ {
+ ByteString aString = pChar;
+ aString.SearchAndReplace( '\t', ' ' );
+ aCommand = aString.GetToken( 0, ' ' );
+
+ aCommandLine = Search( "PATH" );
+ #ifndef UNX
+ aCommandLine += " /c ";
+ #else
+ aCommandLine += " -c ";
+ #endif
+ ByteString rString( pChar );
+
+ ByteString sCmd( rString.GetToken( 0, ' ' ));
+ ByteString sParam( rString.Copy( sCmd.Len()));
+
+ aCommandLine += Search( "PATH", sCmd );
+ aCommandLine += sParam;
+
+ ImplInit();
+ }
+
+ /*****************************************************************************/
+ void CCommand::ImplInit()
+ /*****************************************************************************/
+ {
+ char pTmpStr[255];
+ size_t *pPtr;
+ char *pChar;
+ int nVoid = sizeof( size_t * );
+ nArgc = aCommandLine.GetTokenCount(' ');
+ sal_uIntPtr nLen = aCommandLine.Len();
+
+ ppArgv = (char **) new char[ (sal_uIntPtr)(nLen + nVoid * (nArgc +2) + nArgc ) ];
+ pChar = (char *) ppArgv + ( (1+nArgc) * nVoid );
+ pPtr = (size_t *) ppArgv;
+ for ( xub_StrLen i=0; i<nArgc; i++ )
+ {
+ (void) strcpy( pTmpStr, aCommandLine.GetToken(i, ' ' ).GetBuffer() );
+ size_t nStrLen = strlen( pTmpStr ) + 1;
+ strcpy( pChar, pTmpStr );
+ *pPtr = (sal_uIntPtr) pChar;
+ pChar += nStrLen;
+ pPtr += 1;
+ #ifdef UNX
+ if ( i == 1 )
+ {
+ sal_uInt16 nWo = aCommandLine.Search("csh -c ");
+ if (nWo != STRING_NOTFOUND)
+ aCommandLine.Erase(0, nWo + 7);
+ else
+ aCommandLine.Erase(0, 16);
+ i = nArgc;
+ strcpy( pChar, aCommandLine.GetBuffer() );
+ *pPtr = (sal_uIntPtr) pChar;
+ pPtr += 1;
+ }
+ #endif
+ }
+ *pPtr = 0;
+ }
+
+ /*****************************************************************************/
+ CCommand::operator int()
+ /*****************************************************************************/
+ {
+ int nRet;
+ #if defined WNT
+ nRet = _spawnv( P_WAIT, ppArgv[0], (const char **) ppArgv );
+ #elif defined OS2
+ nRet = _spawnv( P_WAIT, ppArgv[0], ppArgv );
+ #elif defined UNX
+ //fprintf( stderr, "CComand : operator (int) not implemented\n");
+ // **** Unix Implementierung ***************
+ pid_t pid;
+
+ if (( pid = fork()) < 0 )
+ {
+ DBG_ASSERT( sal_False, "fork error" );
+ }
+ else if ( pid == 0 )
+ {
+ if ( execv( ppArgv[0], (char * const *) ppArgv ) < 0 )
+ {
+ DBG_ASSERT( sal_False, "execv failed" );
+ }
+ }
+ //fprintf( stderr, "parent: %s %s\n", ppArgv[0] , ppArgv[1] );
+ if ( (nRet = waitpid( pid, NULL, 0 ) < 0) )
+ {
+ DBG_ASSERT( sal_False, "wait error" );
+ }
+ #endif
+
+ switch ( errno )
+ {
+ case E2BIG :
+ nError = COMMAND_TOOBIG;
+ break;
+ case EINVAL :
+ nError = COMMAND_INVALID;
+ break;
+ case ENOENT:
+ nError = COMMAND_NOTFOUND;
+ break;
+ case ENOEXEC :
+ nError = COMMAND_NOEXEC;
+ break;
+ case ENOMEM :
+ nError = COMMAND_NOMEM;
+ break;
+ default:
+ nError = COMMAND_UNKNOWN;
+ }
+
+ if ( nRet )
+ fprintf( stderr, "Program returned with errros\n");
+ return nRet;
+ }
+
+ /*****************************************************************************/
+ ByteString CCommand::Search(ByteString aEnv, ByteString sItem)
+ /*****************************************************************************/
+ {
+ // default wird eine Shell im Path gesucht,
+ // wenn aber compsec gestzt ist holen wir uns die
+ // Shell von dort
+ if ( sItem.Equals( COMMAND_SHELL ))
+ {
+ ByteString aComspec = GetEnv( "COMSPEC" );
+ if ( !aComspec.Equals(""))
+ return aComspec;
+ }
+
+ DirEntry aItem( String( sItem, RTL_TEXTENCODING_ASCII_US ));
- if ( aItem.Exists())
++ if ( aItem.Exists())
+ return sItem;
+
+ ByteString aEntry, sReturn;
+ ByteString sEnv( aEnv );
+ ByteString sEnvironment = GetEnv( sEnv.GetBuffer());
+ xub_StrLen nCount = sEnvironment.GetTokenCount( cPathSeperator );
+
+ sal_Bool bFound = sal_False;
+
+ for ( xub_StrLen i=0; i<nCount && !bFound; i++ )
+ {
+ aEntry = sEnvironment.GetToken(i, cPathSeperator );
+ #ifndef UNX
+ aEntry += '\\';
+ #else
+ aEntry += '/';
+ #endif
+ aEntry += sItem;
+
+ String sEntry( aEntry, RTL_TEXTENCODING_ASCII_US );
+ DirEntry aDirEntry( sEntry );
+ aDirEntry.ToAbs();
+ if ( aDirEntry.Exists()) {
+ sReturn = aEntry;
+ bFound = sal_True;
+ }
+ }
+ if ( !bFound )
+ {
+ sEnv = sEnv.ToUpperAscii();
+ ByteString sEnvironment2 = GetEnv(sEnv.GetBuffer() );
+ xub_StrLen nCount2 = sEnvironment2.GetTokenCount( cPathSeperator );
+ for ( xub_StrLen i=0; i<nCount2 && !bFound; i++ )
+ {
+ aEntry = sEnvironment2.GetToken(i, cPathSeperator );
+ #ifndef UNX
+ aEntry += '\\';
+ #else
+ aEntry += '/';
+ #endif
+ aEntry += sItem;
+
+ String sEntry( aEntry, RTL_TEXTENCODING_ASCII_US );
+ DirEntry aDirEntry( sEntry );
+ aDirEntry.ToAbs();
+ if ( aDirEntry.Exists()) {
+ sReturn = aEntry;
+ bFound = sal_True;
+ }
+ }
+ }
+
+ if ( sReturn.Equals( "" ))
+ sReturn = sItem;
+
+ return sReturn;
+ }
+
+ /*****************************************************************************/
+ CCommandd::CCommandd( ByteString &rString, CommandBits nBits )
+ /*****************************************************************************/
+ : CCommand( rString ),
+ nFlag( nBits )
+ {
+ }
+
+
+ /*****************************************************************************/
+ CCommandd::CCommandd( const char *pChar, CommandBits nBits )
+ /*****************************************************************************/
+ : CCommand( pChar ),
+ nFlag( nBits )
+ {
+ }
+
+ /*****************************************************************************/
+ CCommandd::operator int()
+ /*****************************************************************************/
+ {
+ int nRet = 0;
+
+ #ifdef WNT
+ LPCTSTR lpApplicationName = NULL;
+ LPTSTR lpCommandLine = (char *) GetCommandLine_().GetBuffer();
+ LPSECURITY_ATTRIBUTES lpProcessAttributes = NULL;
+ LPSECURITY_ATTRIBUTES lpThreadAttributes = NULL;
+ sal_Bool bInheritHandles = sal_True;
+
+ // wie wuenschen wir denn gestartet zu werden ??
+ DWORD dwCreationFlags;
+
+ if ( nFlag & COMMAND_EXECUTE_START )
+ dwCreationFlags = DETACHED_PROCESS;
+ else
+ dwCreationFlags = CREATE_NEW_CONSOLE;
+
+ // wir erben vom Vaterprozess
+ LPVOID lpEnvironment = NULL;
+
+ // das exe im Pfad suchen
+ LPCTSTR lpCurrentDirectory = NULL;
+
+ // in dieser Struktur bekommen wir die erzeugte Processinfo
+ // zurueck
+ PROCESS_INFORMATION aProcessInformation;
+
+ // weiteres Startupinfo anlegen
+ STARTUPINFO aStartupInfo;
+
+ aStartupInfo.cb = sizeof( STARTUPINFO );
+ aStartupInfo.lpReserved = NULL;
+ aStartupInfo.lpDesktop = NULL;
+
+ // das Fenster bekommt den Namen des Exes
+ aStartupInfo.lpTitle = NULL;
+ aStartupInfo.dwX = 100;
+ aStartupInfo.dwY = 100;
+ //aStartupInfo.dwXSize = 400;
+ //aStartupInfo.dwYSize = 400;
+ aStartupInfo.dwXCountChars = 40;
+ aStartupInfo.dwYCountChars = 40;
+
+ // Farben setzen
+ aStartupInfo.dwFillAttribute = FOREGROUND_RED | BACKGROUND_RED |
+ BACKGROUND_BLUE | BACKGROUND_GREEN;
+
+ // aStartupInfo.dwFlags = STARTF_USESTDHANDLES;
+ //aStartupInfo.wShowWindow = SW_NORMAL; //SW_SHOWDEFAULT;
+ //aStartupInfo.wShowWindow = SW_HIDE; //SW_SHOWNOACTIVATE;
+ aStartupInfo.wShowWindow = SW_SHOWNOACTIVATE;
+ aStartupInfo.cbReserved2 = NULL;
+ aStartupInfo.lpReserved2 = NULL;
+ //aStartupInfo.hStdInput = stdin;
+ //aStartupInfo.hStdOutput = stdout;
+ //aStartupInfo.hStdError = stderr;
+
+ if ( nFlag & COMMAND_EXECUTE_HIDDEN )
+ {
+ aStartupInfo.wShowWindow = SW_HIDE;
+ aStartupInfo.dwFlags = aStartupInfo.dwFlags | STARTF_USESHOWWINDOW;
+ }
+
+ bool bProcess = CreateProcess( lpApplicationName,
+ lpCommandLine, lpProcessAttributes,
+ lpThreadAttributes, bInheritHandles,
+ dwCreationFlags, lpEnvironment, lpCurrentDirectory,
+ &aStartupInfo, &aProcessInformation );
+
+ LPVOID lpMsgBuf;
+
+ if ( bProcess )
+ {
+ FormatMessage(
+ FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+ NULL,
+ GetLastError(),
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+ (LPTSTR) &lpMsgBuf,
+ 0,
+ NULL );
+
+ ByteString aErrorString = (char *) lpMsgBuf;
+
+ if ( nFlag & COMMAND_EXECUTE_WAIT )
+ {
+ DWORD aProcessState = STILL_ACTIVE;
+ while(aProcessState == STILL_ACTIVE)
+ {
+ GetExitCodeProcess(aProcessInformation.hProcess,&aProcessState);
+ }
+ }
+ }
+ else
+ fprintf( stderr, "Can not start Process !" );
+
+ #endif
+ return nRet;
+ }
diff --cc solenv/bin/modules/SourceConfig.pm
index fb11ce5,ba60903..6304f46
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@@ -76,8 -76,16 +76,16 @@@ sub new
$source_root .= '/..';
}
} else {
- $source_root = $ENV{SOURCE_ROOT_DIR};
+ $source_root = $ENV{SRC_ROOT};
};
+ if ( defined $ENV{USE_GBUILD} and "$ENV{USE_GBUILD}" ne "" )
+ {
+ $self->{POSSIBLE_BUILD_LIST} = ('gbuild.lst', 'build.lst', 'build.xlist'); # build lists names
+ }
+ else
+ {
+ $self->{POSSIBLE_BUILD_LIST} = ('build.lst', 'build.xlist'); # build lists names
+ }
$source_root = Cwd::realpath($source_root);
$self->{SOURCE_ROOT} = $source_root;
$self->{DEBUG} = 0;
commit 4fbace542bbc8f5e1b1ade4bef311ac69a194843
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Mar 17 13:51:59 2011 +0000
add helper to set-up the libraries env, to run executable during build
Conflicts:
solenv/gbuild/Helper.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/windows.mk
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index d16c7cd..dace867 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -165,4 +165,11 @@ gb_StaticLibrary_$(1) += $(2)
endef
-# vim: set noet sw=4:
+define gb_Helper_execute
+$(call gb_Helper_set_ld_path) $(OUTDIR)/bin/$(1)
+endef
+
+export gb_Helper_set_ld_path
+export gb_Helper_execute
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 231111e..3a708b7 100755
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -153,6 +153,7 @@ gb_COMPILERNOOPTFLAGS := -O0
gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR)/lib
# CObject class
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f6f3d9c..4490d82 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -142,6 +142,8 @@ gb_COMPILERNOOPTFLAGS := -O0
gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
+gb_Helper_set_ld_path := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+
# CObject class
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index a68d369..3795343 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -226,6 +226,7 @@ R=$(gb_Helper_REPODIR_NATIVE) && $(subst $(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)))))))))
endef
+gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
# CObject class
commit ed1d272afede3da7d83c7b60de70231ca61eea62
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Mar 17 14:59:34 2011 +0200
Sprinkle some realpath goodness here, too
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index 0061009..81f0072 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -48,7 +48,7 @@ $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET
-fz$@.sid \
-fx$(EXPORTS) \
-fm$@ \
- $<)
+ $(realpath $<))
.PHONY : $(call gb_SdiTarget_get_clean_target,%)
$(call gb_SdiTarget_get_clean_target,%) :
commit 372aee5399b6e9bbf8871026720ca43d6d5fe6b8
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Mar 17 13:38:36 2011 +0100
killing off stl in gbuild
diff --git a/Repository.mk b/Repository.mk
index 80e03cf..123c418 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -104,10 +104,6 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
salhelper \
))
-$(eval $(call gb_Helper_register_libraries,STLLIBS, \
- stl \
-))
-
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
fsstorage \
hatchwindowfactory \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 7e1bae4..4d26ccc 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -38,8 +38,6 @@ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salh
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
-gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
endif
@@ -51,8 +49,6 @@ gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
-gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
endif
@@ -92,8 +88,6 @@ gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_D
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
-gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES))
-gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
else
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
@@ -108,7 +102,6 @@ gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
gb_Library_NOILIBFILENAMES:=\
advapi32 \
gdi32 \
@@ -155,8 +148,6 @@ endif
# we do not require a known rule for these, when using system libs
-gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-
ifeq ($(SYSTEM_LIBXML),YES)
gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
endif
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index f45094b..d16c7cd 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -117,7 +117,7 @@ endef
define gb_Helper_init_registries
gb_Executable_VALIDGROUPS := UREBIN SDK OOO BRAND NONE
-gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS STLLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS
+gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
$$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=))
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index ad30ff7..5677d79 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -38,7 +38,6 @@
# PRODUCT
# SOLARINC
# SOLARLIB
-# STLPORT_VER
# UPD
# GXX_INCLUDE_PATH (Linux)
@@ -46,7 +45,6 @@
# SYSTEM_ICU (Linux)
# SYSTEM_JPEG (Linux)
# SYSTEM_LIBXML (Linux)
-# USE_SYSTEM_STL (Linux)
SHELL := /bin/sh
true := T
@@ -155,7 +153,6 @@ gb_GLOBALDEFS := \
-DENABLE_LAYOUT_EXPERIMENTAL=0 \
-DENABLE_LAYOUT=0 \
-DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
- -DSTLPORT_VERSION=$(STLPORT_VER) \
-DSUPD=$(UPD) \
-DVCL \
$(gb_OSDEFS) \
@@ -170,7 +167,6 @@ gb_GLOBALDEFS += \
else
gb_GLOBALDEFS += \
-DDBG_UTIL \
- -D_STLP_DEBUG \
-D_DEBUG \
endif
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 1721f7d..231111e 100755
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -260,11 +260,6 @@ gb_Library_SYSPRE := lib
gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
gb_Library_PLAINEXT := .so
gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT)
-else
-gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT)
-endif
ifeq ($(CPUNAME),X86_64)
gb_Library_OOOEXT := lx$(gb_Library_PLAINEXT)
@@ -289,7 +284,6 @@ gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
- $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
@@ -301,7 +295,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
- $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 4d70314..f6f3d9c 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -297,11 +297,6 @@ gb_Library_SYSPRE := lib
gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
gb_Library_PLAINEXT := .dylib
gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT)
-else
-gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT)
-endif
ifeq ($(CPUNAME),INTEL)
gb_Library_OOOEXT := mxi$(gb_Library_PLAINEXT)
@@ -329,7 +324,6 @@ gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
- $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
@@ -341,7 +335,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
- $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 6845384..a7b1b29 100755
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -227,11 +227,6 @@ gb_Library_SYSPRE := lib
gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
gb_Library_PLAINEXT := .so
gb_Library_RTEXT := C52$(gb_Library_PLAINEXT)
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := port_sunpro$(gb_Library_PLAINEXT)
-else
-gb_Library_STLEXT := port_sunpro_debug$(gb_Library_PLAINEXT)
-endif
ifeq ($(CPUNAME),INTEL)
gb_Library_OOOEXT := si$(gb_Library_PLAINEXT)
@@ -256,7 +251,6 @@ gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
- $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
@@ -268,7 +262,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
- $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index cad5be5..a68d369 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -458,7 +458,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
- $(foreach lib,$(gb_Library_STLLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
@@ -469,11 +468,6 @@ gb_Library_FILENAMES :=\
gb_Library_DLLEXT := .dll
gb_Library_MAJORVER := 3
gb_Library_RTEXT := MSC$(gb_Library_DLLEXT)
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := port_vc7145$(gb_Library_DLLEXT)
-else
-gb_Library_STLEXT := port_vc7145_stldebug$(gb_Library_DLLEXT)
-endif
gb_Library_OOOEXT := mi$(gb_Library_DLLEXT)
gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT)
gb_Library_UNOVEREXT := $(gb_Library_MAJORVER)$(gb_Library_DLLEXT)
@@ -486,7 +480,6 @@ gb_Library_DLLFILENAMES :=\
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVEREXT)) \
- $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(lib)$(gb_Library_STLEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index d9e5ed8..b786498 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -472,7 +472,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
- $(foreach lib,$(gb_Library_STLLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
@@ -483,11 +482,6 @@ gb_Library_FILENAMES :=\
gb_Library_DLLEXT := .dll
gb_Library_MAJORVER := 3
gb_Library_RTEXT := gcc3$(gb_Library_DLLEXT)
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := port_gcc$(gb_Library_DLLEXT)
-else
-gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_DLLEXT)
-endif
gb_Library_OOOEXT := gi$(gb_Library_DLLEXT)
gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT)
gb_Library_UNOVEREXT := $(gb_Library_MAJORVER)$(gb_Library_DLLEXT)
commit 787ff726b3fc657c044a0debc1bae822e93873b2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Mar 17 14:23:37 2011 +0200
No stlport used any more on Windows
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index b685703..7e1bae4 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -71,11 +71,6 @@ gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
-else
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
-endif
gb_Library_NOILIBFILENAMES:=\
icuuc \
sot \
@@ -113,11 +108,7 @@ gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
-else
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
-endif
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
gb_Library_NOILIBFILENAMES:=\
advapi32 \
gdi32 \
commit d2c34efe434c152d913becd7a8abc0173bb010dd
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Mar 17 12:01:15 2011 +0200
Add realpath calls
This avoids passing pathnames containing symlinks to non-Cygwin
programs. Calling realpath here hopefully means that we don't need to
explicitly expand the pathnames for the src files listed in the
*/AllLangResTarget_*.mk files.
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 763f2a4..4a655d3 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -69,10 +69,10 @@ $(call gb_Helper_abbreviate_dirs_native,\
RESPONSEFILE=`$(gb_MKTEMP)` && \
echo "-s \
$(INCLUDE) \
- -I$(dir $(3)) \
+ -I$(realpath $(dir $(3))) \
$(DEFS) \
-fp=$(1) \
- $(if $<,$<,$(MERGEDFILE))" > $${RESPONSEFILE} && \
+ $(realpath $(if $<,$<,$(MERGEDFILE)))" > $${RESPONSEFILE} && \
$(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
rm -rf $${RESPONSEFILE})
@@ -199,7 +199,7 @@ endef
gb_ResTarget_RSCTARGET := $(gb_SrsPartTarget_RSCTARGET)
gb_ResTarget_RSCCOMMAND := $(gb_SrsPartTarget_RSCCOMMAND)
-gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/default_images/
+gb_ResTarget_DEFIMAGESLOCATION := $(realpath $(SRCDIR)/default_images)/
$(call gb_ResTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),RES,2)
commit fe4b69e65a1aec5b45390eae65f998a047edbbae
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 19:59:10 2011 +0200
The WIN_FOO dance no longer needed
diff --git a/solenv/inc/postwin.h b/solenv/inc/postwin.h
index 58342e5..a21eaa7 100644
--- a/solenv/inc/postwin.h
+++ b/solenv/inc/postwin.h
@@ -38,16 +38,8 @@
#undef PolyPolygon
#undef Polygon
#undef Rectangle
-#undef BYTE
#undef DELETE
-#ifndef VCL_NEED_BASETSD
-#undef INT64
-#undef UINT64
-#undef INT32
-#undef UINT32
-#undef ULONG
-#endif
#undef Folder
#undef GradientStyle_RECT
diff --git a/solenv/inc/prewin.h b/solenv/inc/prewin.h
index 0c07a62..21afbdf 100644
--- a/solenv/inc/prewin.h
+++ b/solenv/inc/prewin.h
@@ -30,15 +30,6 @@
#if defined WNT
-#define BYTE WIN_BYTE
-#ifndef VCL_NEED_BASETSD
-#define INT64 WIN_INT64
-#define UINT64 WIN_UINT64
-#define INT32 WIN_INT32
-#define UINT32 WIN_UINT32
-#define ULONG WIN_ULONG
-#endif
-
#define Rectangle BLA_Rectangle
#define Polygon BLA_Polygon
#define PolyPolygon BLA_PolyPolygon
commit b99b04850eae0a602b096b36dda0f04b1d0a33dc
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 17:30:49 2011 +0200
The WIN_BOOL dance no longer needed and in fact causes compilation errors
diff --git a/solenv/inc/postwin.h b/solenv/inc/postwin.h
index 4a2f196..58342e5 100644
--- a/solenv/inc/postwin.h
+++ b/solenv/inc/postwin.h
@@ -39,7 +39,6 @@
#undef Polygon
#undef Rectangle
#undef BYTE
-#undef BOOL
#undef DELETE
#ifndef VCL_NEED_BASETSD
@@ -249,9 +248,9 @@
#ifdef WNT
extern "C"
{
-WIN_BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 );
-WIN_BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt );
-WIN_BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt );
+BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 );
+BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt );
+BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt );
}
#endif
diff --git a/solenv/inc/prewin.h b/solenv/inc/prewin.h
index 7744dbe..0c07a62 100644
--- a/solenv/inc/prewin.h
+++ b/solenv/inc/prewin.h
@@ -30,7 +30,6 @@
#if defined WNT
-#define BOOL WIN_BOOL
#define BYTE WIN_BYTE
#ifndef VCL_NEED_BASETSD
#define INT64 WIN_INT64
commit cef51de4450adccfb433373d28ccb77b044483b5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 15:52:18 2011 +0200
Revert "Revert "Xsltproc is a non-Cygwin program on Windows so use realpath""
This reverts commit 19bd92e4348b500c98b0da4230bfaf7d838133ab.
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index a96a62b..504bd5a 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -36,7 +36,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
$(gb_XSLTPROC) --nonet --stringparam uri \
'$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
- $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
+ $(gb_ComponentTarget_XSLTCOMMANDFILE) $(realpath $(2)))
endef
commit 9fc5d209ef5cd8554945ebb426faea753f805233
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 15:52:16 2011 +0200
Revert "Revert "Sprinkle more realpath calls""
This reverts commit a6b8a0d1e59abc52fa54ea2741837b7cde9c1731.
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index d1cb80b..cad5be5 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -258,7 +258,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(gb_CC) \
$(DEFS) $(CFLAGS) -Fd$(PDBFILE) \
$(PCHFLAGS) \
- -I$(dir $(3)) \
+ -I$(realpath $(dir $(3))) \
$(INCLUDE) \
-c $(realpath $(3)) \
-Fo$(1))
@@ -297,7 +297,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(gb_CXX) \
$(DEFS) $(CXXFLAGS) -Fd$(PDBFILE)\
$(PCHFLAGS) \
- -I$(dir $(3)) \
+ -I$(realpath $(dir $(3))) \
$(INCLUDE_STL) $(INCLUDE) \
-c $(realpath $(3)) \
-Fo$(1))
@@ -339,7 +339,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
unset INCLUDE && \
$(gb_CXX) \
$(4) $(5) -Fd$(PDBFILE) \
- -I$(dir $(3)) \
+ -I$(realpath $(dir $(3))) \
$(6) \
-c $(realpath $(3)) \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
@@ -380,7 +380,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
unset INCLUDE && \
$(gb_CXX) \
$(4) $(5) -Fd$(PDBFILE) \
- -I$(dir $(3)) \
+ -I$(realpath $(dir $(3))) \
$(6) \
-c $(realpath $(3)) \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
commit 1fca179c87b34815897b8a60680f6fe4e05d2d17
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 15:52:08 2011 +0200
Revert "Revert "Use realpath on the filename being compiled to expand Cygwin symlinks""
This reverts commit b4260a9b516241dd42d992cc148235e153a66d18.
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 853f872..d1cb80b 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -260,7 +260,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(PCHFLAGS) \
-I$(dir $(3)) \
$(INCLUDE) \
- -c $(3) \
+ -c $(realpath $(3)) \
-Fo$(1))
$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
endef
@@ -299,7 +299,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(PCHFLAGS) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE) \
- -c $(3) \
+ -c $(realpath $(3)) \
-Fo$(1))
$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
endef
@@ -341,7 +341,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(4) $(5) -Fd$(PDBFILE) \
-I$(dir $(3)) \
$(6) \
- -c $(3) \
+ -c $(realpath $(3)) \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
$(call gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
endef
@@ -382,7 +382,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(4) $(5) -Fd$(PDBFILE) \
-I$(dir $(3)) \
$(6) \
- -c $(3) \
+ -c $(realpath $(3)) \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
$(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
endef
commit b4260a9b516241dd42d992cc148235e153a66d18
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 13:37:02 2011 +0200
Revert "Use realpath on the filename being compiled to expand Cygwin symlinks"
This reverts commit 4c745207efbbd16e788a416b711703f0298a1ab3.
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index d1cb80b..853f872 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -260,7 +260,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(PCHFLAGS) \
-I$(dir $(3)) \
$(INCLUDE) \
- -c $(realpath $(3)) \
+ -c $(3) \
-Fo$(1))
$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
endef
@@ -299,7 +299,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(PCHFLAGS) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE) \
- -c $(realpath $(3)) \
+ -c $(3) \
-Fo$(1))
$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
endef
@@ -341,7 +341,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(4) $(5) -Fd$(PDBFILE) \
-I$(dir $(3)) \
$(6) \
- -c $(realpath $(3)) \
+ -c $(3) \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
$(call gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
endef
@@ -382,7 +382,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(4) $(5) -Fd$(PDBFILE) \
-I$(dir $(3)) \
$(6) \
- -c $(realpath $(3)) \
+ -c $(3) \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
$(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
endef
commit a6b8a0d1e59abc52fa54ea2741837b7cde9c1731
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 13:36:58 2011 +0200
Revert "Sprinkle more realpath calls"
This reverts commit dc803980f04acba6bd0d4a1cdd9a75eb57cd8659.
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index cad5be5..d1cb80b 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -258,7 +258,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(gb_CC) \
$(DEFS) $(CFLAGS) -Fd$(PDBFILE) \
$(PCHFLAGS) \
- -I$(realpath $(dir $(3))) \
+ -I$(dir $(3)) \
$(INCLUDE) \
-c $(realpath $(3)) \
-Fo$(1))
@@ -297,7 +297,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(gb_CXX) \
$(DEFS) $(CXXFLAGS) -Fd$(PDBFILE)\
$(PCHFLAGS) \
- -I$(realpath $(dir $(3))) \
+ -I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE) \
-c $(realpath $(3)) \
-Fo$(1))
@@ -339,7 +339,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
unset INCLUDE && \
$(gb_CXX) \
$(4) $(5) -Fd$(PDBFILE) \
- -I$(realpath $(dir $(3))) \
+ -I$(dir $(3)) \
$(6) \
-c $(realpath $(3)) \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
@@ -380,7 +380,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
unset INCLUDE && \
$(gb_CXX) \
$(4) $(5) -Fd$(PDBFILE) \
- -I$(realpath $(dir $(3))) \
+ -I$(dir $(3)) \
$(6) \
-c $(realpath $(3)) \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
commit 19bd92e4348b500c98b0da4230bfaf7d838133ab
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 13:36:52 2011 +0200
Revert "Xsltproc is a non-Cygwin program on Windows so use realpath"
This reverts commit 8593849221aa71dc5781f811b88d0205a718bdd1.
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 504bd5a..a96a62b 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -36,7 +36,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
$(gb_XSLTPROC) --nonet --stringparam uri \
'$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
- $(gb_ComponentTarget_XSLTCOMMANDFILE) $(realpath $(2)))
+ $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
endef
commit 8593849221aa71dc5781f811b88d0205a718bdd1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 13:13:33 2011 +0200
Xsltproc is a non-Cygwin program on Windows so use realpath
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index a96a62b..504bd5a 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -36,7 +36,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
$(gb_XSLTPROC) --nonet --stringparam uri \
'$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
- $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
+ $(gb_ComponentTarget_XSLTCOMMANDFILE) $(realpath $(2)))
endef
commit 62d089daba8263316971d037394210bb57b7c3f9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 12:54:52 2011 +0200
Add msvcprt, too, wherever msvcrt is mentioned
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 91e1fcd..b685703 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -125,6 +125,7 @@ gb_Library_NOILIBFILENAMES:=\
icuuc \
kernel32 \
msvcrt \
+ msvcprt \
mpr \
oldnames \
ole32 \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index a16ec55..cad5be5 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -164,6 +164,7 @@ gb_STDLIBS := \
uwinapi \
kernel32 \
msvcrt \
+ msvcprt \
oldnames \
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
@@ -438,6 +439,7 @@ gb_Library_PLAINLIBS_NONE += \
gnu_getopt \
kernel32 \
msvcrt \
+ msvcprt \
mpr \
oldnames \
ole32 \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 918283a..d9e5ed8 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -140,7 +140,7 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
gb_LinkTarget_NOEXCEPTIONFLAGS := \
-DEXCEPTIONS_OFF \
-fno-exceptions \
-
+
gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
gb_LinkTarget_LDFLAGS := \
@@ -175,6 +175,7 @@ gb_STDLIBS := \
mingwex \
kernel32 \
msvcrt \
+ msvcprt \
# Helper class
@@ -452,6 +453,7 @@ gb_Library_PLAINLIBS_NONE += \
gdi32 \
kernel32 \
msvcrt \
+ msvcprt \
mpr \
moldname \
ole32 \
commit 8054a020c5f4f4d739a26595cde439e0f0678c6e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 11:51:11 2011 +0200
Remove unnecessary whitespace on empty line
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 34362b9..a16ec55 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -180,7 +180,7 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
gb_LinkTarget_NOEXCEPTIONFLAGS := \
-DEXCEPTIONS_OFF \
-
+
gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
gb_LinkTarget_LDFLAGS := \
commit 1acd340af5c5f559decc6998bd32e6905ea89b1e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 11:49:42 2011 +0200
Revert "Fix bogus line continuation and empty line spacing"
This reverts commit 66364955f47ce478c32325bafb22283fd47621c8.
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 91a88b8..34362b9 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -179,8 +179,8 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
gb_LinkTarget_NOEXCEPTIONFLAGS := \
- -DEXCEPTIONS_OFF
-
+ -DEXCEPTIONS_OFF \
+
gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
gb_LinkTarget_LDFLAGS := \
commit dc803980f04acba6bd0d4a1cdd9a75eb57cd8659
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 11:49:30 2011 +0200
Sprinkle more realpath calls
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index d1458a8..91a88b8 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -257,7 +257,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(gb_CC) \
$(DEFS) $(CFLAGS) -Fd$(PDBFILE) \
$(PCHFLAGS) \
- -I$(dir $(3)) \
+ -I$(realpath $(dir $(3))) \
$(INCLUDE) \
-c $(realpath $(3)) \
-Fo$(1))
@@ -296,7 +296,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(gb_CXX) \
$(DEFS) $(CXXFLAGS) -Fd$(PDBFILE)\
$(PCHFLAGS) \
- -I$(dir $(3)) \
+ -I$(realpath $(dir $(3))) \
$(INCLUDE_STL) $(INCLUDE) \
-c $(realpath $(3)) \
-Fo$(1))
@@ -338,7 +338,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
unset INCLUDE && \
$(gb_CXX) \
$(4) $(5) -Fd$(PDBFILE) \
- -I$(dir $(3)) \
+ -I$(realpath $(dir $(3))) \
$(6) \
-c $(realpath $(3)) \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
@@ -379,7 +379,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
unset INCLUDE && \
$(gb_CXX) \
$(4) $(5) -Fd$(PDBFILE) \
- -I$(dir $(3)) \
+ -I$(realpath $(dir $(3))) \
$(6) \
-c $(realpath $(3)) \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
commit 66364955f47ce478c32325bafb22283fd47621c8
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 11:26:03 2011 +0200
Fix bogus line continuation and empty line spacing
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 66ccfa8..d1458a8 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -179,8 +179,8 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
gb_LinkTarget_NOEXCEPTIONFLAGS := \
- -DEXCEPTIONS_OFF \
-
+ -DEXCEPTIONS_OFF
+
gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
gb_LinkTarget_LDFLAGS := \
commit 4c745207efbbd16e788a416b711703f0298a1ab3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 11:24:59 2011 +0200
Use realpath on the filename being compiled to expand Cygwin symlinks
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 148a1da..66ccfa8 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -259,7 +259,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(PCHFLAGS) \
-I$(dir $(3)) \
$(INCLUDE) \
- -c $(3) \
+ -c $(realpath $(3)) \
-Fo$(1))
$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
endef
@@ -298,7 +298,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(PCHFLAGS) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE) \
- -c $(3) \
+ -c $(realpath $(3)) \
-Fo$(1))
$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
endef
@@ -340,7 +340,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(4) $(5) -Fd$(PDBFILE) \
-I$(dir $(3)) \
$(6) \
- -c $(3) \
+ -c $(realpath $(3)) \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
$(call gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
endef
@@ -381,7 +381,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(4) $(5) -Fd$(PDBFILE) \
-I$(dir $(3)) \
$(6) \
- -c $(3) \
+ -c $(realpath $(3)) \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
$(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
endef
commit 5f228840059ec0da8aa90fcee82e9ea9617cabae
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Tue Mar 15 22:58:42 2011 -0400
Define SOLAR_JAVA only when --with-java.
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 085909a..ad30ff7 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -155,7 +155,6 @@ gb_GLOBALDEFS := \
-DENABLE_LAYOUT_EXPERIMENTAL=0 \
-DENABLE_LAYOUT=0 \
-DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
- -DSOLAR_JAVA \
-DSTLPORT_VERSION=$(STLPORT_VER) \
-DSUPD=$(UPD) \
-DVCL \
@@ -176,6 +175,10 @@ gb_GLOBALDEFS += \
endif
+ifneq ($(strip $(SOLAR_JAVA)),)
+gb_GLOBALDEFS += -DSOLAR_JAVA
+endif
+
ifeq ($(gb_DEBUGLEVEL),2)
gb_GLOBALDEFS += \
-DDEBUG \
commit 233af7940f364252672c14f89b63e8ca01057756
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Mar 15 19:21:30 2011 +0100
When linking, first specify -o's, then -l's.
Some linkers do not find some symbols otherwise.
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index c9988df..1721f7d 100755
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -227,11 +227,11 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_CXX) \
$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(subst \d,$$,$(RPATH)) $(LDFLAGS) \
- $(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
$(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 \
+ $(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
-o $(1))
endef
commit 6f43ac8652bf82050387a38f3ffdcdc420f5cf7e
Author: Michael Meeks <michael.meeks at novell.com>
Date: Tue Mar 15 17:09:15 2011 +0000
remove obsolete linkoo piece
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 3732f2b..37a5f1a 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -340,7 +340,6 @@ sub link_soffice_bin_files()
$dest = "$OOO_BUILD/desktop/$TARGET/bin";
do_link ($src, $dest, 'soffice', 'soffice.bin', 1);
do_link ($src, $dest, 'bootstraprc', 'bootstraprc', 1);
- do_link ($src, $dest, 'intro.bmp', 'intro.bmp', 1);
do_link ("$OOO_INSTALL", "$OOO_BUILD/desktop/$TARGET", 'share', 'share', 1);
print "\n";
commit 6963ab2fd7f35282f30f7d41dbcfa53b5a255826
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 15 09:03:55 2011 -0500
add support for symbol=t in gnumake to build release code with symbol
It is needed to be able to build the release code with the debug symbol
and without disabling the build optimisations
setting symbol=xxx symbols=xxx SYMBOL=xxxx or SYMBOLS=xxx
where xxx is anything not purely spaces
will activate the generation of symbols
Note that this generation is implicit with debug=t.
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b3bf7b8..085909a 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -83,8 +83,16 @@ gb_PRODUCT := $(false)
endif
endif
+ifneq ($(strip $(SYMBOL)$(symbol)$(SYMBOLS)$(symbols)),)
+gb_SYMBOL := $(false)
+else
+gb_SYMBOL := $(true)
+endif
+
+
ifneq ($(strip $(DEBUG)$(debug)),)
gb_DEBUGLEVEL := 2
+gb_SYMBOL := $(true)
else
ifeq ($(gb_PRODUCT),$(true))
gb_DEBUGLEVEL := 0
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 3917660..c9988df 100755
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -208,11 +208,16 @@ gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
ifeq ($(gb_DEBUGLEVEL),2)
-gb_LinkTarget_CXXFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
-gb_LinkTarget_CFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+gb_LinkTarget_CXXFLAGS += -finline-limit=0 -fno-inline -fno-default-inline
+gb_LinkTarget_CFLAGS += -finline-limit=0 -fno-inline -fno-default-inline
endif
+ifeq ($(gb_SYMBOL),$(true))
+gb_LinkTarget_CXXFLAGS += -ggdb3
+gb_LinkTarget_CFLAGS += -ggdb3
+endif
+
gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 9811e80..4d70314 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -220,7 +220,7 @@ gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_OBJCXXFLAGS) $(gb_COMPILEROPTFLAGS)
-ifeq ($(gb_DEBUGLEVEL),2)
+ifeq ($(gb_SYMBOL),$(true))
gb_LinkTarget_CFLAGS += -g
gb_LinkTarget_CXXFLAGS += -g
gb_LinkTarget_OBJCXXFLAGS += -g
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 4f657a2..6845384 100755
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -181,7 +181,7 @@ gb_LinkTarget__RPATHS := \
gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
-ifeq ($(gb_DEBUGLEVEL),2)
+ifeq ($(gb_SYMBOL),$(true))
gb_LinkTarget_CXXFLAGS += -g
gb_LinkTarget_CFLAGS += -g
endif
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index fe0904f..148a1da 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -199,9 +199,12 @@ gb_CFLAGS+=-Zi
gb_CXXFLAGS+=-Zi
endif
-ifeq ($(gb_DEBUGLEVEL),2)
+ifeq ($(gb_SYMBOL),$(true))
gb_CXXFLAGS +=-Zi
gb_CFLAGS +=-Zi
+endif
+
+ifeq ($(gb_DEBUGLEVEL),2)
gb_COMPILEROPTFLAGS :=
gb_LinkTarget_LDFLAGS += -DEBUG
else
commit 5b77e7fad500b4a0a4c66e0c74a8ea42ab72591d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Mar 14 20:10:52 2011 +0100
cppunittester is in bin/cppunit here
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index a6c80f7..cb7cbba 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -31,7 +31,7 @@
# defined by platform
# gb_CppunitTest_TARGETTYPE
# gb_CppunitTest_get_filename
-gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunittester)
+gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunittester)
gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) $(gb_CppunitTest_CPPTESTTARGET)
gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
commit d57adc4ac4024246b3f4583d1fc88a09d1e92919
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Mar 12 21:26:42 2011 -0600
use SRCDIR intead of the completely unset LOCDIR
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index efb5ab5..763f2a4 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -31,7 +31,7 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target,transex3)
# gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
-gb_SrsPartMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf/
+gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/l10n/$(INPATH)/misc/sdf/
gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
define gb_SrsPartMergeTarget__command
commit 60c87b829367b07a8532d6f892c73e502b497379
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Mar 12 18:49:52 2011 -0600
mis-merge: issue with stl. this may no be the right resolution
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index bada67c..91e1fcd 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -38,10 +38,8 @@ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salh
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
endif
@@ -53,10 +51,8 @@ gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
endif
@@ -101,10 +97,8 @@ gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_D
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
else
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
@@ -169,9 +163,7 @@ endif
# we do not require a known rule for these, when using system libs
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
ifeq ($(SYSTEM_LIBXML),YES)
gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
commit 45554c687072cf076775146f65e23f6f0becd951
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Mar 12 18:49:14 2011 -0600
mismerge: l10n has not changed location in libo
diff --git a/set_soenv.in b/set_soenv.in
index b030b38..b1b3cc0 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1521,7 +1521,6 @@ $gb_REPOS = $SRC_ROOT;
if ('@WITH_LANG@' ne "")
{
- $gb_REPOS .= " ".$SOURCE_ROOT_DIR."/l10n";
$BUILD_TYPE = "@BUILD_TYPE@ L10N";
}
else
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index c2579cd..9e9291c 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -221,7 +221,6 @@ finish
}
common_setrepo:0 IF X%WITH_LANG%X != XX
{
- gb_REPOS %gb_REPOS% %SOURCE_ROOT_DIR%/l10n
BUILD_TYPE %BUILD_TYPE% L10N
}
common_jre:0 IF %JREPATH% ==
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index de93a62..bbce4ff 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -809,7 +809,7 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
.EXPORT : SOLARBINDIR
-L10N_MODULE*=$(SOURCE_ROOT_DIR)/l10n/l10n
+L10N_MODULE*=$(SRC_ROOT)/l10n
ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so
.IF "$(WITH_LANG)"!=""
commit fb616d07076eb87fe70e8a3add17152df84ebd6b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Mar 12 18:48:33 2011 -0600
mis-merge: no more vos3
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 406cb6a..bada67c 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -73,7 +73,6 @@ gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
ifeq ($(gb_PRODUCT),$(true))
@@ -118,7 +117,6 @@ gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
ifeq ($(gb_PRODUCT),$(true))
commit ee3ec09f07f32a28fb77d59732ca43d6781e415f
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Mar 11 14:30:09 2011 +0100
Spaces -> tabs in gbuild, GNU make does not like spaces ;-)
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 1b7acc9..efb5ab5 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -37,19 +37,19 @@ gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
define gb_SrsPartMergeTarget__command
$(call gb_Output_announce,$(3),$(true),srs,1)
$(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(dir $(1)) && \
- $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
- -p $(firstword $(subst /, ,$(2))) \
- -i $(3) \
- -o $(1) \
- -m $(SDF) \
- -l all)
+ mkdir -p $(dir $(1)) && \
+ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+ -p $(firstword $(subst /, ,$(2))) \
+ -i $(3) \
+ -o $(1) \
+ -m $(SDF) \
+ -l all)
endef
define gb_SrsPartMergeTarget__rules
$$(call gb_SrsPartMergeTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartMergeTarget_TRANSEXTARGET)
- $$(if $$(SDF),$$(call gb_SrsPartMergeTarget__command,$$@,$$*,$$<),mkdir -p $$(dir $$@) && cp $$< $$@)
+ $$(if $$(SDF),$$(call gb_SrsPartMergeTarget__command,$$@,$$*,$$<),mkdir -p $$(dir $$@) && cp $$< $$@)
endef
@@ -65,29 +65,29 @@ gb_SrsPartTarget_REPOS := $(gb_REPOS)
define gb_SrsPartTarget__command
$(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(dir $(1)) && \
- RESPONSEFILE=`$(gb_MKTEMP)` && \
- echo "-s \
- $(INCLUDE) \
- -I$(dir $(3)) \
- $(DEFS) \
- -fp=$(1) \
- $(if $<,$<,$(MERGEDFILE))" > $${RESPONSEFILE} && \
- $(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
- rm -rf $${RESPONSEFILE})
+ mkdir -p $(dir $(1)) && \
+ RESPONSEFILE=`$(gb_MKTEMP)` && \
+ echo "-s \
+ $(INCLUDE) \
+ -I$(dir $(3)) \
+ $(DEFS) \
+ -fp=$(1) \
+ $(if $<,$<,$(MERGEDFILE))" > $${RESPONSEFILE} && \
+ $(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
+ rm -rf $${RESPONSEFILE})
endef
define gb_SrsPartTarget__rules
$$(call gb_SrsPartTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartTarget_RSCTARGET)
- $$(call gb_SrsPartTarget__command_dep,$$*,$$<)
- $$(call gb_SrsPartTarget__command,$$@,$$*,$$<)
+ $$(call gb_SrsPartTarget__command_dep,$$*,$$<)
+ $$(call gb_SrsPartTarget__command,$$@,$$*,$$<)
ifeq ($(gb_FULLDEPS),$(true))
$$(call gb_SrsPartTarget_get_dep_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY)
- $$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $$(dir $$@) && \
- echo '$$(call gb_SrsPartTarget_get_target,$$*) : $$(gb_Helper_PHONY)' > $$@)
+ $$(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $$(dir $$@) && \
+ echo '$$(call gb_SrsPartTarget_get_target,$$*) : $$(gb_Helper_PHONY)' > $$@)
endif
endef
@@ -96,7 +96,7 @@ $(foreach repo,$(gb_SrsPartTarget_REPOS),$(eval $(call gb_SrsPartTarget__rules,$
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_SrsPartTarget_get_dep_target,%) :
- $(eval $(call gb_Output_error,Unable to find resource definition file $* in repositories: $(gb_SrsPartTarget_REPOS)))
+ $(eval $(call gb_Output_error,Unable to find resource definition file $* in repositories: $(gb_SrsPartTarget_REPOS)))
endif
@@ -118,33 +118,33 @@ gb_SrsTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
.PHONY : $(call gb_SrsTarget_get_clean_target,%)
$(call gb_SrsTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),SRS,1)
- -$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_SrsTarget_get_target,$*) \
- $(call gb_SrsTarget_get_dep_target,$*) \
- $(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_target,$(part))) \
- $(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))) \
- $(foreach part,$(PARTS),$(call gb_SrsPartMergeTarget_get_target,$(part))))
+ $(call gb_Output_announce,$*,$(false),SRS,1)
+ -$(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_SrsTarget_get_target,$*) \
+ $(call gb_SrsTarget_get_dep_target,$*) \
+ $(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_target,$(part))) \
+ $(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))) \
+ $(foreach part,$(PARTS),$(call gb_SrsPartMergeTarget_get_target,$(part))))
ifeq ($(gb_FULLDEPS),$(true))
define gb_SrsTarget__command_dep
$(call gb_Output_announce,SRS:$(2),$(true),DEP,1)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- cat $(3) > $(1))
+ mkdir -p $(dir $(1)) && \
+ cat $(3) > $(1))
endef
endif
$(call gb_SrsTarget_get_target,%) :
- $(call gb_SrsTarget__command_dep,$(call gb_SrsTarget_get_dep_target,$*),$*,$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))))
- $(call gb_Output_announce,$*,$(true),SRS,1)
- $(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $@) && \
- cat $^ > $@)
+ $(call gb_SrsTarget__command_dep,$(call gb_SrsTarget_get_dep_target,$*),$*,$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))))
+ $(call gb_Output_announce,$*,$(true),SRS,1)
+ $(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $@) && \
+ cat $^ > $@)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_SrsTarget_get_dep_target,%) :
- $(call gb_SrsTarget__command_dep,$@,$*,$^)
+ $(call gb_SrsTarget__command_dep,$@,$*,$^)
endif
define gb_SrsTarget_SrsTarget
@@ -202,38 +202,38 @@ gb_ResTarget_RSCCOMMAND := $(gb_SrsPartTarget_RSCCOMMAND)
gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/default_images/
$(call gb_ResTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),RES,2)
- $(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*) $(call gb_ResTarget_get_outdir_imagelist_target,$*))
+ $(call gb_Output_announce,$*,$(false),RES,2)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*) $(call gb_ResTarget_get_outdir_imagelist_target,$*))
$(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCTARGET)
- $(call gb_Output_announce,$*,$(true),RES,2)
- $(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(dir $@) $(OUTDIR)/bin \
- $(dir $(call gb_ResTarget_get_imagelist_target,$*)) && \
- RESPONSEFILE=`$(gb_MKTEMP)` && \
- echo "-r -p \
- -lg$(LANGUAGE) \
- -fs=$@ \
- -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/$(LIBRARY)) \
- -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE)) \
- -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst) \
- -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE)) \
- -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res) \
- -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \
- -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \
- -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \
- -subMODULE=$(dir $(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION))) \
- -subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
- -oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \
- $(filter-out $(gb_Helper_MISCDUMMY),$^)" > $${RESPONSEFILE} && \
- $(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
- rm -f $${RESPONSEFILE})
+ $(call gb_Output_announce,$*,$(true),RES,2)
+ $(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $@) $(OUTDIR)/bin \
+ $(dir $(call gb_ResTarget_get_imagelist_target,$*)) && \
+ RESPONSEFILE=`$(gb_MKTEMP)` && \
+ echo "-r -p \
+ -lg$(LANGUAGE) \
+ -fs=$@ \
+ -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/$(LIBRARY)) \
+ -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE)) \
+ -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst) \
+ -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE)) \
+ -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res) \
+ -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \
+ -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \
+ -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \
+ -subMODULE=$(dir $(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION))) \
+ -subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
+ -oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \
+ $(filter-out $(gb_Helper_MISCDUMMY),$^)" > $${RESPONSEFILE} && \
+ $(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
+ rm -f $${RESPONSEFILE})
$(call gb_ResTarget_get_outdir_target,%) :
- $(call gb_Helper_abbreviate_dirs,\
- $(call gb_Deliver_deliver,$<,$@) && \
- $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(ILSTTARGET)),$(ILSTTARGET)))
+ $(call gb_Helper_abbreviate_dirs,\
+ $(call gb_Deliver_deliver,$<,$@) && \
+ $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(ILSTTARGET)),$(ILSTTARGET)))
define gb_ResTarget_ResTarget
$(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2)
@@ -263,13 +263,13 @@ endef
define gb_ResTarget_add_files
$(foreach file,$(2),\
- $(call gb_ResTarget_add_file,$(1),$(file)))
+ $(call gb_ResTarget_add_file,$(1),$(file)))
endef
define gb_ResTarget_add_srs
$(foreach srs,$(2),\
- $(call gb_ResTarget_add_one_srs,$(1),$(srs)))
+ $(call gb_ResTarget_add_one_srs,$(1),$(srs)))
endef
@@ -288,36 +288,36 @@ gb_AllLangResTarget_LANGS := $(1)
endef
$(call gb_AllLangResTarget_get_clean_target,%) :
- $(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_AllLangResTarget_get_target,$*))
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_AllLangResTarget_get_target,$*))
$(call gb_AllLangResTarget_get_target,%) :
- $(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $@) && touch $@)
+ $(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $@) && touch $@)
define gb_AllLangResTarget_AllLangResTarget
$(foreach lang,$(gb_AllLangResTarget_LANGS),\
- $(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
+ $(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
$$(eval $$(call gb_Module_register_target,$(call gb_AllLangResTarget_get_target,$(1)),$(call gb_AllLangResTarget_get_clean_target,$(1))))
endef
define gb_AllLangResTarget_add_one_srs
$(foreach lang,$(gb_AllLangResTarget_LANGS),\
- $(call gb_ResTarget_add_one_srs,$(1)$(lang),$(2)))
+ $(call gb_ResTarget_add_one_srs,$(1)$(lang),$(2)))
endef
define gb_AllLangResTarget_add_srs
$(foreach srs,$(2),\
- $(call gb_AllLangResTarget_add_one_srs,$(1),$(srs)))
+ $(call gb_AllLangResTarget_add_one_srs,$(1),$(srs)))
endef
define gb_AllLangResTarget_set_reslocation
$(foreach lang,$(gb_AllLangResTarget_LANGS),\
- $(call gb_ResTarget_set_reslocation,$(1)$(lang),$(2)))
+ $(call gb_ResTarget_set_reslocation,$(1)$(lang),$(2)))
endef
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index e317120..a8a823b 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -56,4 +56,4 @@ $(eval $(call gb_Output_error,The initial makefile $(realpath $(firstword $(MAKE
endif
endif
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 5fc15ba..a96a62b 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -33,30 +33,30 @@ gb_ComponentTarget_get_source = $(1)/$(2).component
define gb_ComponentTarget__command
$(call gb_Output_announce,$(3),$(true),CMP,1)
$(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(dir $(1)) && \
- $(gb_XSLTPROC) --nonet --stringparam uri \
- '$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
- $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
+ mkdir -p $(dir $(1)) && \
+ $(gb_XSLTPROC) --nonet --stringparam uri \
+ '$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
+ $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
endef
define gb_ComponentTarget__rules
$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
- $$(call gb_ComponentTarget__command,$$@,$$<,$$*)
+ $$(call gb_ComponentTarget__command,$$@,$$<,$$*)
$$(call gb_ComponentTarget_get_clean_target,%) :
- $$(call gb_Output_announce,$$*,$(false),CMP,1)
- rm -f $$(call gb_ComponentTarget_get_outdir_target,$$*) $$(call gb_ComponentTarget_get_target,$$*)
+ $$(call gb_Output_announce,$$*,$(false),CMP,1)
+ rm -f $$(call gb_ComponentTarget_get_outdir_target,$$*) $$(call gb_ComponentTarget_get_target,$$*)
endef
$(foreach repo,$(gb_ComponentTarget_REPOS),$(eval $(call gb_ComponentTarget__rules,$(repo))))
$(call gb_ComponentTarget_get_target,%) :
- $(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xlstproc is missing.))
+ $(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xlstproc is missing.))
$(call gb_ComponentTarget_get_external_target,%) :
- $(call gb_Deliver_deliver,$<,$@)
+ $(call gb_Deliver_deliver,$<,$@)
define gb_ComponentTarget_ComponentTarget
$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
@@ -66,4 +66,4 @@ $(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(
endef
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index a3b18a4..a6c80f7 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -37,15 +37,15 @@ gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filen
.PHONY : $(call gb_CppunitTest_get_clean_target,%)
$(call gb_CppunitTest_get_clean_target,%) :
- $(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_CppunitTest_get_target,$*) $(call gb_CppunitTest_get_target,$*).log)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_CppunitTest_get_target,$*) $(call gb_CppunitTest_get_target,$*).log)
.PHONY : $(call gb_CppunitTest_get_target,%)
$(call gb_CppunitTest_get_target,%) : $(gb_CppunitTest_CPPTESTTARGET)
- $(call gb_Output_announce,$*,$(true),CUT,2)
- $(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(dir $@) && \
- $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) > $@.log 2>&1 || (cat $@.log && false))
+ $(call gb_Output_announce,$*,$(true),CUT,2)
+ $(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $@) && \
+ $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) > $@.log 2>&1 || (cat $@.log && false))
define gb_CppunitTest_CppunitTest
$(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest__get_linktargetname,$(1)))
@@ -69,28 +69,28 @@ gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_lin
endef
$(eval $(foreach method,\
- add_cobject \
- add_cobjects \
- add_cxxobject \
- add_cxxobjects \
- add_objcxxobject \
- add_objcxxobjects \
- add_exception_objects \
- add_noexception_objects \
- set_cflags \
- set_cxxflags \
- set_objcxxflags \
- set_defs \
- set_include \
- set_ldflags \
- set_library_path_flags \
- add_linked_libs \
- add_linked_static_libs \
- add_package_headers \
- add_sdi_headers \
- add_precompiled_header \
+ add_cobject \
+ add_cobjects \
+ add_cxxobject \
+ add_cxxobjects \
+ add_objcxxobject \
+ add_objcxxobjects \
+ add_exception_objects \
+ add_noexception_objects \
+ set_cflags \
+ set_cxxflags \
+ set_objcxxflags \
+ set_defs \
+ set_include \
+ set_ldflags \
+ set_library_path_flags \
+ add_linked_libs \
+ add_linked_static_libs \
+ add_package_headers \
+ add_sdi_headers \
+ add_precompiled_header \
,\
- $(call gb_CppunitTest__forward_to_Linktarget,$(method))\
+ $(call gb_CppunitTest__forward_to_Linktarget,$(method))\
))
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 0829435..97be0f2 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -30,30 +30,30 @@ gb_CustomTarget_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
# N.B.: putting the "+" there at the start activates the GNU make job server
define gb_CustomTarget__command
+$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
- $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
- touch $(1))
+ mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
+ $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
+ touch $(1))
endef
define gb_CustomTarget__rules
$$(call gb_CustomTarget_get_repo_target,$(1),%) :
- $$(call gb_Output_announce,$$*,$$(true),MAK,3)
- $$(call gb_CustomTarget__command,$$@,$$*)
+ $$(call gb_Output_announce,$$*,$$(true),MAK,3)
+ $$(call gb_CustomTarget__command,$$@,$$*)
$$(call gb_CustomTarget_get_target,%) : $$(call gb_CustomTarget_get_repo_target,$(1),%)
- $$(call gb_Helper_abbreviate_dirs,\
- touch $$@)
+ $$(call gb_Helper_abbreviate_dirs,\
+ touch $$@)
endef
.PHONY: $(call gb_CustomTarget_get_clean_target,%)
$(call gb_CustomTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),MAK,3)
- $(call gb_Helper_abbreviate_dirs,\
- rm -rf $(call gb_CustomTarget_get_workdir,$*) && \
- rm -f $(call gb_CustomTarget_get_target,$*) \
- $(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(call gb_CustomTarget_get_repo_target,$(reponame),$*)))
+ $(call gb_Output_announce,$*,$(false),MAK,3)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -rf $(call gb_CustomTarget_get_workdir,$*) && \
+ rm -f $(call gb_CustomTarget_get_target,$*) \
+ $(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(call gb_CustomTarget_get_repo_target,$(reponame),$*)))
$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(eval $(call gb_CustomTarget__rules,$(reponame))))
@@ -64,7 +64,7 @@ endef
define gb_CustomTarget_CustomTarget
$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\
- $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(call gb_CustomTarget__get_makefile,$($(reponame)),$(1))))
+ $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(call gb_CustomTarget__get_makefile,$($(reponame)),$(1))))
$(call gb_CustomTarget_get_workdir,$(1))/% : $(call gb_CustomTarget_get_target,$(1))
@@ -73,7 +73,7 @@ endef
define gb_CustomTarget_add_dependency
$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\
- $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $($(reponame))/$(2)))
+ $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $($(reponame))/$(2)))
endef
@@ -84,7 +84,7 @@ endef
define gb_CustomTarget_add_outdir_dependency
$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\
- $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(2)))
+ $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(2)))
endef
@@ -93,4 +93,4 @@ $(foreach dependency,$(2),$(call gb_CustomTarget_add_outdir_dependency,$(1),$(de
endef
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index 31d2599..d395c86 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -66,7 +66,7 @@ deliverlog : COMMAND := \
mkdir -p $$(OUTDIR)/inc/$$(strip $$(gb_Module_ALLMODULES)) \
&& RESPONSEFILE=$$(call var2file,$(shell $(gb_MKTEMP)),100,$$(sort $$(gb_Deliver_DELIVERABLES))) \
&& $(gb_AWK) -f $$(GBUILDDIR)/processdelivered.awk < $$$${RESPONSEFILE} \
- > $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log \
+ > $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log \
&& rm -f $$$${RESPONSEFILE}
else
$$(eval $$(call gb_Output_announce,more than one module - creating no deliver.log,$$(true),LOG,1))
@@ -78,8 +78,8 @@ endef
# deliver.log format is broken in that case anyway
.PHONY : deliverlog showdeliverables
deliverlog:
- $(eval $(call gb_Deliver_setdeliverlogcommand))
- $(call gb_Helper_abbreviate_dirs, $(COMMAND))
+ $(eval $(call gb_Deliver_setdeliverlogcommand))
+ $(call gb_Helper_abbreviate_dirs, $(COMMAND))
# all : deliverlog
@@ -88,8 +88,8 @@ $(info $(1) $(patsubst $(OUTDIR)/%,%,$(2)))
endef
showdeliverables :
- $(eval MAKEFLAGS := s)
- $(foreach deliverable,$(sort $(gb_Deliver_DELIVERABLES)),\
- $(call gb_Deliver_print_deliverable,$(REPODIR)/$(firstword $(subst :, ,$(deliverable))),$(REPODIR)/$(lastword $(subst :, ,$(deliverable)))))
- true
-# vim: set noet sw=4 ts=4:
+ $(eval MAKEFLAGS := s)
+ $(foreach deliverable,$(sort $(gb_Deliver_DELIVERABLES)),\
+ $(call gb_Deliver_print_deliverable,$(REPODIR)/$(firstword $(subst :, ,$(deliverable))),$(REPODIR)/$(lastword $(subst :, ,$(deliverable)))))
+ true
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index a1cf1c3..90519f9 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -32,14 +32,14 @@
.PHONY : $(call gb_Executable_get_clean_target,%)
$(call gb_Executable_get_clean_target,%) :
- $(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_Executable_get_target,$*) \
- $(AUXTARGETS))
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_Executable_get_target,$*) \
+ $(AUXTARGETS))
$(call gb_Executable_get_target,%) :
- $(call gb_Helper_abbreviate_dirs,\
- $(call gb_Deliver_deliver,$<,$@) \
- $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
+ $(call gb_Helper_abbreviate_dirs,\
+ $(call gb_Deliver_deliver,$<,$@) \
+ $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
define gb_Executable_Executable
$(call gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT))
@@ -63,29 +63,29 @@ gb_Executable_$(1) = $$(call gb_LinkTarget_$(1),Executable/$$(1)$$(gb_Executable
endef
$(eval $(foreach method,\
- add_cobject \
- add_cobjects \
- add_cxxobject \
- add_cxxobjects \
- add_objcxxobject \
- add_objcxxobjects \
- add_exception_objects \
- add_noexception_objects \
- add_generated_exception_objects \
- set_cflags \
- set_cxxflags \
- set_objcxxflags \
- set_defs \
- set_include \
- set_ldflags \
- set_library_path_flags \
- add_linked_libs \
- add_linked_static_libs \
- add_package_headers \
- add_sdi_headers \
- add_precompiled_header \
+ add_cobject \
+ add_cobjects \
+ add_cxxobject \
+ add_cxxobjects \
+ add_objcxxobject \
+ add_objcxxobjects \
+ add_exception_objects \
+ add_noexception_objects \
+ add_generated_exception_objects \
+ set_cflags \
+ set_cxxflags \
+ set_objcxxflags \
+ set_defs \
+ set_include \
+ set_ldflags \
+ set_library_path_flags \
+ add_linked_libs \
+ add_linked_static_libs \
+ add_package_headers \
+ add_sdi_headers \
+ add_precompiled_header \
,\
- $(call gb_Executable_forward_to_Linktarget,$(method))\
+ $(call gb_Executable_forward_to_Linktarget,$(method))\
))
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 4cdcb80..f45094b 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -48,7 +48,7 @@ gb_Helper_REPOSITORYNAMES :=
.PHONY : $(WORKDIR)/Misc/PHONY
$(gb_Helper_MISCDUMMY) :
- @mkdir -p $(dir $@) && touch $@
+ @mkdir -p $(dir $@) && touch $@
define gb_Helper_abbreviate_dirs
R=$(REPODIR) && \
@@ -74,19 +74,19 @@ endef
define gb_Helper_make_clean_targets
$(foreach targettype,$(1),\
- $(call gb_Helper_make_clean_target,$(targettype)))
+ $(call gb_Helper_make_clean_target,$(targettype)))
endef
define gb_Helper_make_outdir_clean_targets
$(foreach targettype,$(1),\
- $(call gb_Helper_make_outdir_clean_target,$(targettype)))
+ $(call gb_Helper_make_outdir_clean_target,$(targettype)))
endef
define gb_Helper_make_dep_targets
$(foreach targettype,$(1),\
- $(call gb_Helper_make_dep_target,$(targettype)))
+ $(call gb_Helper_make_dep_target,$(targettype)))
endef
@@ -165,4 +165,4 @@ gb_StaticLibrary_$(1) += $(2)
endef
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 655aedb..33d3b32 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -30,27 +30,27 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
define gb_JavaClassSet__command
$(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(dir $(1)) && \
- $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(3) && \
- touch $(1))
+ mkdir -p $(dir $(1)) && \
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list