[Libreoffice-commits] .: 2 commits - guw/guw.cc set_soenv.in solenv/bin stlport/makefile.mk
Tor Lillqvist
tml at kemper.freedesktop.org
Sat May 14 14:38:28 PDT 2011
guw/guw.cc | 8 --------
set_soenv.in | 21 +--------------------
solenv/bin/guw.pl | 8 --------
stlport/makefile.mk | 41 +++--------------------------------------
4 files changed, 4 insertions(+), 74 deletions(-)
New commits:
commit b9cad3cdf2ffc201443de7d86db21ef7fa7e1d89
Author: Tor Lillqvist <tml at iki.fi>
Date: Sun May 15 00:37:04 2011 +0300
Kill obsolete STAR_FOO stuff
diff --git a/guw/guw.cc b/guw/guw.cc
index a3a2f86..431866c 100644
--- a/guw/guw.cc
+++ b/guw/guw.cc
@@ -98,15 +98,7 @@ const string transformvars[] = { "SOLAR_VERSION",
"SOLARVERSION",
"SOLARVER",
"SRC_ROOT",
- "LOCALINI",
- "GLOBALINI",
"SOLARENV",
- "STAR_INSTPATH",
- "STAR_SOLARPATH",
- "STAR_PACKMISC",
- "STAR_SOLARENVPATH",
- "STAR_INITROOT",
- "STAR_STANDLST",
"CLASSPATH",
"JAVA_HOME" };
diff --git a/set_soenv.in b/set_soenv.in
index 8ef87ff..64a0418 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -76,11 +76,10 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
$L10N_MODULE, $WITH_POOR_HELP_LOCALIZATIONS,
$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,
$PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $JAVALIB,
- $SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL,
+ $SOLARINC, $FRAMEWORKSHOME, $COMEX, $PERL,
$COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $DOTNET_FRAMEWORK_HOME,
$USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
@@ -967,18 +966,6 @@ $SOLARDEFIMG = PathFormat($SRC_ROOT.$DEFIMGS);
$SOLARENVINC = '$SOLARENV'.$INC;
-# Location of
-$LOCALINI = '$SOLARENV'.$CONFIG;
-# Location of
-$STAR_INIROOT = '$SOLARENV'.$CONFIG;
-# Location of
-$STAR_INIROOTOLD = '$SOLARENV'.$CONFIG;
-# Location of
-$STAR_STANDLST = '$SOLARENV'.$CONFIG.$ds."stand.lst";
-# Location of
-$STAR_SSCOMMON = '$SOLARENV'.$CONFIG.$ds."ssolar.cmn";
-# Location of
-$STAR_SSOLARINI = '$SOLARENV'.$CONFIG.$ds."ssolar.ini";
# Location of dmake resource.
$DMAKEROOT = '$SOLARENVINC'.$ds."startup";
# Location of JDK classes .zip file.
@@ -1683,12 +1670,6 @@ ToFile( "OUTDIR", $OUTDIR, "e" );
ToFile( "SOLARENV", $SOLARENV, "e" );
ToFile( "SOLARDEFIMG", $SOLARDEFIMG, "e" );
ToFile( "SOLARENVINC", $SOLARENVINC, "e" );
-ToFile( "LOCALINI", $LOCALINI, "e" );
-ToFile( "STAR_INIROOT", $STAR_INIROOT, "e" );
-ToFile( "STAR_INIROOTOLD", $STAR_INIROOTOLD, "e" );
-ToFile( "STAR_STANDLST", $STAR_STANDLST, "e" );
-ToFile( "STAR_SSCOMMON", $STAR_SSCOMMON, "e" );
-ToFile( "STAR_SSOLARINI", $STAR_SSOLARINI, "e" );
ToFile( "DMAKEROOT", $DMAKEROOT, "e" );
if ( $JDK ne "gcj" ) {
ToFile( "CLASSPATH", $CLASSPATH, "e" );
diff --git a/solenv/bin/guw.pl b/solenv/bin/guw.pl
index e263e46..ce91ee8 100755
--- a/solenv/bin/guw.pl
+++ b/solenv/bin/guw.pl
@@ -301,15 +301,7 @@ sub replace_cyg_env {
'SOLARVERSION',
'SOLARVER',
'SRC_ROOT',
- 'LOCALINI',
- 'GLOBALINI',
'SOLARENV',
- 'STAR_INSTPATH',
- 'STAR_SOLARPATH',
- 'STAR_PACKMISC',
- 'STAR_SOLARENVPATH',
- 'STAR_INITROOT',
- 'STAR_STANDLST',
'CLASSPATH',
'JAVA_HOME'
);
commit 9dc4110b31dde0b1d773b9e5855a0ed4f00559ec
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat May 14 23:40:32 2011 +0300
Drop stuff for old MSVC versions we don't support anyway
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index 2d3c6b5..06f0e88 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -51,15 +51,9 @@ all:
STLport-4.5-gcc43_warnings.patch \
STLport-4.5-cxx0x.patch
.ELIF "$(GUI)"=="WNT"
- .IF "$(CCNUMVER)"<="001300000000"
- TARFILE_NAME=STLport-4.0
- TARFILE_MD5=c441926f3a552ed3e5b274b62e86af16
- PATCH_FILES=STLport-4.0.patch
- .ELSE
- TARFILE_NAME=STLport-4.5-0119
- TARFILE_MD5=7376930b0d3f3d77a685d94c4a3acda8
- PATCH_FILES=STLport-4.5-0119.patch
- .ENDIF
+ TARFILE_NAME=STLport-4.5-0119
+ TARFILE_MD5=7376930b0d3f3d77a685d94c4a3acda8
+ PATCH_FILES=STLport-4.5-0119.patch
.ELSE
TARFILE_NAME=STLport-4.0
TARFILE_MD5=c441926f3a552ed3e5b274b62e86af16
@@ -99,11 +93,7 @@ BUILD_DIR=src
.IF "$(COM)"=="MSC"
BUILD_ACTION=nmake
-.IF "$(CCNUMVER)"<="001400000000"
-BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHsc"
-.ELSE # "$(CCNUMVER)"<="001400000000"
BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER)
-.ENDIF # "$(CCNUMVER)"<="001400000000"
.ENDIF
.IF "$(COM)"=="GCC"
@@ -192,29 +182,4 @@ OUT2LIB= \
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-.IF "$(CCNUMVER)"<="001300000000"
-
-$(MISC)$/$(TARFILE_ROOTDIR) : avoid_win32_patches
-avoid_win32_patches :
- @$(ECHONL)
- @echo ERROR! this module can't use automated patch creation
- @echo on windows.
- @$(ECHONL)
- force_dmake_to_error
-
-$(PACKAGE_DIR)$/so_custom_patch : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
- win32_custom.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-
-$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_custom_patch
-
-$(PACKAGE_DIR)$/win32_sdk_patch : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
- win32_sdk.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-
-$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch
-.ENDIF # COMVER<=001300000000
-.ENDIF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
-
.ENDIF # "$(WITH_STLPORT)"!="YES"
More information about the Libreoffice-commits
mailing list