set_soenv.in | 37 ++++++-------------------------- solenv/gbuild/gbuild.mk | 1 solenv/gbuild/platform/WNT_INTEL_GCC.mk | 1 solenv/gbuild/platform/WNT_INTEL_MSC.mk | 1 solenv/inc/set_wntx64.mk | 2 - solenv/inc/settings.mk | 4 +-- solenv/inc/startup/startup.mk | 2 - tools/Library_tl.mk | 1 8 files changed, 11 insertions(+), 38 deletions(-)
New commits: commit 4cb5e2e08163d44990e67648e6ad09186c297a5d Author: Tor Lillqvist <t...@iki.fi> Date: Mon Dec 12 11:16:57 2011 +0200 Drop some unused variables diff --git a/set_soenv.in b/set_soenv.in index 7c2e5fc..2f32cb8 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -34,11 +34,11 @@ use File::Basename; #-------------------------------------------------------- # my ( $oldoutfile, $outfile, $bootfile, $newline, $comment, - $compiler, $ds, $ps, + $ds, $ps, $wps, $cur_dir, $par_dir, $I, $L, $tmp, $MINGW, $platform, - $cygwinver, $empty, $no_ant, $no_gcc_include, - $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $exportvars, $win_format_var, @mingw_lib_include_paths, $mingw_lib_include_path); + $empty, + $warnfile, $Warning, $result, $unsetvars, $exportvars); # #------------------------------------------------- # IIb. Declaring environment values (constants). commit 13876ef22f42256ab575d5678b7a4165c7388076 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Dec 12 11:14:05 2011 +0200 We only support Cygwin Perl on Windows diff --git a/set_soenv.in b/set_soenv.in index ea815b7..7c2e5fc 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -38,7 +38,7 @@ my ( $oldoutfile, $outfile, $bootfile, $newline, $comment, $wps, $cur_dir, $par_dir, $I, $L, $tmp, $MINGW, $platform, $cygwinver, $empty, $no_ant, $no_gcc_include, - $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path); + $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $exportvars, $win_format_var, @mingw_lib_include_paths, $mingw_lib_include_path); # #------------------------------------------------- # IIb. Declaring environment values (constants). @@ -146,11 +146,6 @@ print ("Setting up the environment for building LibreOffice $newline"); # V. Setting the environment variables/values. #-------------------------------------------------- # -# A. Checking the platform first. -# -# get perls idea for OS -# needed to differentiate cygwin/native perl on windows -$perl_os = $^O; # # B. Gathering information from the system. @@ -798,9 +793,6 @@ if ( "@WITH_MOZILLA@" eq "YES" and "@BUILD_MOZAB@" ne "TRUE" and "@SYSTEM_MOZILL { print("Checking for prebuilt Mozilla libraries ..."); my $mozbinfile = $SRC_ROOT."/moz/zipped/"; - if ( $^O eq 'MSWin32' ) { - chomp( $mozbinfile = qx{cygpath -d "$mozbinfile"} ); - } $mozbinfile .= $OS.$COM.$CPU; if ( -e $mozbinfile."inc.zip" and -e $mozbinfile."lib.zip" @@ -2137,7 +2129,7 @@ sub CheckPathName #------------------------------------------------------------- sub CheckPathExist { my $dir = $_[ 0 ]; - if ( !( -d $dir ) and $^O ne 'MSWin32' ) + if ( !( -d $dir ) ) { print ( "The directory $_[ 0 ] does not exist. Please create first.\n" ); exit 1; } commit abb06e33756e9a3cc5fd77d7b14bb2e7e7ec5b2f Author: Tor Lillqvist <t...@iki.fi> Date: Mon Dec 12 10:59:19 2011 +0200 The VCL environment variable, always "TRUE", is not used diff --git a/set_soenv.in b/set_soenv.in index 8f95941..ea815b7 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -46,7 +46,6 @@ my ( $oldoutfile, $outfile, $bootfile, $newline, $comment, # # Platform independent constant values. my ( $SOLAR_JAVA, - $VCL, $CC, $CXX); # # Platform dependent constant values. @@ -165,7 +164,6 @@ chomp( $oldPATH ); # cut off new line # Setting platform independent constant values. # NB: Language options now set at 'ToFile' stage. $SOLAR_JAVA = "@SOLAR_JAVA@"; -$VCL = "TRUE"; $comment = "#"; # UNIX script comment character $TARFILE_LOCATION = "@TARFILE_LOCATION@"; # where to find tarballs with external sources @@ -1418,7 +1416,6 @@ ToFile( "OOODMAKEMODE", "YES", "e" ); ToFile( "PRODUCTVERSION", "@PRODUCTVERSION@", "e" ); ToFile( "WITH_POOR_HELP_LOCALIZATIONS", $WITH_POOR_HELP_LOCALIZATIONS, "e" ); -ToFile( "VCL", $VCL, "e" ); if ("@ENABLE_DEBUG@" eq "TRUE") { ToFile( "debug", "true", "e" ); } commit 026ce875672f1e02dd5931372d169891eb92aff7 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Dec 12 10:57:12 2011 +0200 Drop two unused variables diff --git a/set_soenv.in b/set_soenv.in index 36c0ba0..8f95941 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -66,10 +66,10 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV $CYGWIN_PATH, $language, @languages, $ASM_PATH, $PERL_PATH, $CL_X64 ); # Environment variables. -my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, +my ( $oldPATH, $SRC_ROOT, $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, + $SOLARSRC, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, $SOLARENV, $SOLARDEFIMG, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $SHOWINCLUDES_PREFIX, $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $JAVALIB, @@ -922,7 +922,6 @@ if ('@TARFILE_LOCATION@' eq "DEFAULT") } # -$DEVROOT = '$SRC_ROOT'; $SOLARENV = PathFormat($SRC_ROOT.$SOLENV); # Location of the solver tree. if ('@LOCAL_SOLVER@' eq "DEFAULT") commit c682be8ba5c0b5d9bb8579b10c73a0023214366a Author: Tor Lillqvist <t...@iki.fi> Date: Mon Dec 12 10:48:06 2011 +0200 I don't see VCL or NT351 being checked in any ifdef So drop the GVER thing and -DVCL and -DNT351. diff --git a/set_soenv.in b/set_soenv.in index 3233417..36c0ba0 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -51,7 +51,7 @@ my ( $SOLAR_JAVA, # # Platform dependent constant values. my ( $COM, $ARCH, $CPU, $CPUNAME, $GUI, $GUIBASE, - $GVER, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, + $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $DYNAMIC_CRT, $use_shl_versions, $JRELIBDIR, $JRETOOLKITDIR, $JRETHREADDIR ); # @@ -208,7 +208,6 @@ if ( $platform =~ m/solaris/ ) $COMPATH = '@COMPATH@'; $GUI = "UNX"; $GUIBASE = "unx"; - $GVER = "VCL"; $INPATH = $OUTPATH.$PROEXT; $OS = "SOLARIS"; $PATH_SEPERATOR = $ps; @@ -257,7 +256,6 @@ elsif ( $platform =~ m/netbsd/ ) $COMPATH = '@COMPATH@'; $GUI = "UNX"; $GUIBASE = "unx"; - $GVER = "VCL"; $OS = "NETBSD"; $PATH_SEPERATOR = $ps; $OUTPATH = "unxnbsd"; @@ -271,7 +269,6 @@ elsif ( $platform =~ m/kfreebsd/ ) $COMPATH = '@COMPATH@'; $GUI = "UNX"; $GUIBASE = "unx"; - $GVER = "VCL"; $OS = "LINUX"; $PATH_SEPERATOR = $ps; @@ -307,7 +304,6 @@ elsif ( $platform =~ m/freebsd/ ) $COMPATH = '@COMPATH@'; $GUI = "UNX"; $GUIBASE = "unx"; - $GVER = "VCL"; $OS = "FREEBSD"; $PATH_SEPERATOR = $ps; $OSVERSION = '@OSVERSION@'; @@ -351,7 +347,6 @@ elsif ( $platform =~ m/openbsd/ ) $COMPATH = '@COMPATH@'; $GUI = "UNX"; $GUIBASE = "unx"; - $GVER = "VCL"; $OS = "OPENBSD"; $PATH_SEPERATOR = $ps; $OSVERSION = '@OSVERSION@'; @@ -387,7 +382,6 @@ elsif ( $platform =~ m/linux/ ) $COMPATH = '@COMPATH@'; $GUI = "UNX"; $GUIBASE = "unx"; - $GVER = "VCL"; $OS = "LINUX"; $PATH_SEPERATOR = $ps; @@ -632,7 +626,6 @@ elsif ( $platform =~ m/cygwin|mingw32/ ) $CPU = "X" if $CL_X64; $GUI = "WNT"; $GUIBASE = "WIN"; - $GVER = "NT351"; $OS = "WNT"; $DYNAMIC_CRT = "TRUE"; $use_shl_versions = "TRUE"; @@ -719,7 +712,6 @@ elsif ( $platform =~ m/darwin/ ) $MACOSX_SDK_PATH='@MACOSX_SDK_PATH@'; $FRAMEWORKSHOME = $MACOSX_SDK_PATH."/System/Library/Frameworks"; } - $GVER = "VCL"; $INPATH = $OUTPATH.$PROEXT; $PATH_SEPERATOR = $ps; } @@ -750,7 +742,6 @@ elsif ( $platform =~ m/dragonfly/ ) $COMPATH = '@COMPATH@'; $GUI = "UNX"; $GUIBASE = "unx"; - $GVER = "VCL"; $OS = "DRAGONFLY"; $PATH_SEPERATOR = $ps; $OUTPATH = "unxdfly"; @@ -771,7 +762,6 @@ elsif ( $platform =~ m/aix/ ) $COMPATH = '@COMPATH@'; $GUI = "UNX"; $GUIBASE = "unx"; - $GVER = "VCL"; $INPATH = $OUTPATH.$PROEXT; $OS = "AIX"; $PATH_SEPERATOR = $ps; @@ -1553,7 +1543,6 @@ ToFile( "CPU", $CPU, "e" ); ToFile( "CPUNAME", $CPUNAME, "e" ); ToFile( "GUI", $GUI, "e" ); ToFile( "GUIBASE", $GUIBASE, "e" ); -ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); ToFile( "OSVERSION", $OSVERSION, "e" ); ToFile( "PTHREAD_CFLAGS", "@PTHREAD_CFLAGS@", "e" ); diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index e85ed83..521a9c9 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -182,7 +182,6 @@ gb_GLOBALDEFS := \ -D_REENTRANT \ -DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \ -DSUPD=$(UPD) \ - -DVCL \ $(gb_OSDEFS) \ $(gb_COMPILERDEFS) \ $(gb_CPUDEFS) \ diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 92b4dbb..40027a1 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -39,7 +39,6 @@ gb_RC := $(WINDRES) gb_OSDEFS := \ -DWINVER=0x0500 \ -D_WIN32_IE=0x0500 \ - -DNT351 \ -DWIN32 \ -DWNT \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 5f8fb1c..45c9609 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -52,7 +52,6 @@ endif gb_OSDEFS := \ -DWINVER=0x0500 \ -D_WIN32_IE=0x0500 \ - -DNT351 \ -DWIN32 \ -DWNT \ diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index c29e8ba..b886aa9 100644 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_wntx64.mk @@ -46,7 +46,7 @@ USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR # Stack buffer overrun detection. CFLAGS+=-GS -USE_CDEFS_X64+= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -DX86_64 -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS +USE_CDEFS_X64+= -D$(OS) -D$(GUI) -D$(COM) -DX86_64 -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS .IF "$(debug)"!="" USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb USE_CDEFS_X64+=-DDEBUG diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 592290d..3b9b260 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -807,7 +807,7 @@ CDEFS=-D$(OS) .IF "$(GUI)" != "$(OS)" CDEFS+=-D$(GUI) .ENDIF -CDEFS+=-D$(GVER) -D$(COM) -D$(CPUNAME) +CDEFS+=-D$(COM) -D$(CPUNAME) .IF "$(USE_DEBUG_RUNTIME)" != "" CDEFS+=-D_DEBUG_RUNTIME @@ -897,7 +897,7 @@ RSCUPDVER=$(RSCREVISION) RSCUPDVERDEF=-DUPDVER="$(RSCUPDVER)" RSCFLAGS=-s -RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) $(JAVADEF) +RSCDEFS=-D$(GUI) -D$(COM) $(JAVADEF) RSCDEFIMG*=default_images diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk index e3e415e..0fa378c 100644 --- a/solenv/inc/startup/startup.mk +++ b/solenv/inc/startup/startup.mk @@ -33,7 +33,7 @@ CALLTARGETS=$(MAKETARGETS) .INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc $(SOLARENV)$/inc # Grab key definitions from the environment -# .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL ENVCFLAGS +# .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT ENVCFLAGS .IF "$(OS)" == "" || "$(OS)" == "Windows_NT" .ERROR : ; @echo Forced error: Environment variable OS has to be set for OOo build! diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index b575427..2724575 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -39,7 +39,6 @@ $(eval $(call gb_Library_set_include,tl,\ $(eval $(call gb_Library_add_defs,tl,\ -DTOOLS_DLLIMPLEMENTATION \ - -DVCL \ )) $(eval $(call gb_Library_add_api,tl,\ _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits