Skip to content

C
core
Kaydet (Commit) 19b77d8f authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov
Dosyalara gözat
Seçenekler

INTEGRATION: CWS geordi2q11 (1.12.4); FILE MERGED 

2003/12/15 17:45:58 hr 1.12.4.1: #111934#: join CWS ooo111fix1
üst 43805211
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 6 deletions
config_office/set_soenv.in
Dosyayı görüntüle @ 19b77d8f
#!@PERL@ -w #!@PERL@ -w
# #
# Program: set_soenv.in # Program: set_soenv.in
# Version: $Revision: 1.12 $ # Version: $Revision: 1.13 $
# Date: $Date: 2003-12-01 17:39:16 $ # Date: $Date: 2003-12-17 15:01:33 $
# Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland.
# #
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
...@@ -776,7 +776,7 @@ if ( $platform eq "$Macosx" ) ...@@ -776,7 +776,7 @@ if ( $platform eq "$Macosx" )
# Same as UPD, used in the buildproces. # Same as UPD, used in the buildproces.
$SOLARUPD = $UPD; $SOLARUPD = $UPD;
# The project's workstamp. # The project's workstamp.
$WORK_STAMP = "SRX".$UPD; $WORK_STAMP = "@SOURCEVERSION@";
# #
$TF_ONE51 = $WORK_STAMP; $TF_ONE51 = $WORK_STAMP;
# #
...@@ -1366,6 +1366,7 @@ ToFile( "JAVA_HOME", $JAVA_HOME, "e" ); ...@@ -1366,6 +1366,7 @@ ToFile( "JAVA_HOME", $JAVA_HOME, "e" );
if ( '@JDK@' ne '' ) if ( '@JDK@' ne '' )
{ ToFile( "JDK", "@JDK@", "e" ); { ToFile( "JDK", "@JDK@", "e" );
} }
ToFile( "XSLTPROC", "@XSLTPROC@", "e" );
ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); ToFile( "ANT_HOME", "@ANT_HOME@", "e" );
ToFile( "JDKLIB", $JAVA_LIB, "e" ); ToFile( "JDKLIB", $JAVA_LIB, "e" );
ToFile( "STLPORT4", $STLPORT4, "e" ); ToFile( "STLPORT4", $STLPORT4, "e" );
...@@ -1697,6 +1698,7 @@ else { ...@@ -1697,6 +1698,7 @@ else {
} }
} }
ToFile( "SOLARDEF", $SOLARDEF, "e" ); ToFile( "SOLARDEF", $SOLARDEF, "e" );
ToFile( "SCPDEFS", '@SCPDEFS@', "e" );
ToFile( "SOLAREXTRAINC", $SOLAREXTRAINC, "e" ); ToFile( "SOLAREXTRAINC", $SOLAREXTRAINC, "e" );
ToFile( "SOLAREXTRALIB", $SOLAREXTRALIB, "e" ); ToFile( "SOLAREXTRALIB", $SOLAREXTRALIB, "e" );
ToFile( "SOLARINCLUDES", $SOLARINCLUDES, "e" ); ToFile( "SOLARINCLUDES", $SOLARINCLUDES, "e" );
...@@ -1721,6 +1723,13 @@ ToFile( "LIBART_LIBS", "@LIBART_LIBS@", "e" ); ...@@ -1721,6 +1723,13 @@ ToFile( "LIBART_LIBS", "@LIBART_LIBS@", "e" );
ToFile( "WITH_LIBSN", "@WITH_LIBSN@", "e" ); ToFile( "WITH_LIBSN", "@WITH_LIBSN@", "e" );
ToFile( "LIBSN_CFLAGS", "@LIBSN_CFLAGS@", "e" ); ToFile( "LIBSN_CFLAGS", "@LIBSN_CFLAGS@", "e" );
ToFile( "LIBSN_LIBS", "@LIBSN_LIBS@", "e" ); ToFile( "LIBSN_LIBS", "@LIBSN_LIBS@", "e" );
ToFile( "WITH_MOZILLA", "@WITH_MOZILLA@", "e" );
ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" );
if ( '@ENABLE_RPATH@' eq "no" ) {
ToFile( "LINKFLAGSRUNPATH",'', "e" );
}
ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" );
ToFile( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" );
ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@", "e" ); ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@", "e" );
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" ); ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
if ($platform ne "$Winnt") if ($platform ne "$Winnt")
...@@ -1793,12 +1802,12 @@ if ( $platform ne "$Winnt" ) ...@@ -1793,12 +1802,12 @@ if ( $platform ne "$Winnt" )
if ( $platform eq "$Winnt" and '@USE_SHELL@' eq "4nt" ) if ( $platform eq "$Winnt" and '@USE_SHELL@' eq "4nt" )
{ {
ToFile( "build the dmake executable.", $empty, "c"); ToFile( "build the dmake executable.", $empty, "c");
ToFile( "if not exist \%SRC_ROOT\\dmake\\dmake.exe (cd \%SRC_ROOT\\dmake \^ call make.bat win95-vpp40 \^ cd \%SRC_ROOT)", $empty, "x"); ToFile( "if not exist \%SOLARENV\\\%OUTPATH\\bin\\dmake.exe (cd \%SRC_ROOT\\dmake \^ call make.bat win95-vpp40 \^ cd \%SRC_ROOT)", $empty, "x");
ToFile( "if not exist \%SOLARENV\\\%OUTPATH\\bin\\dmake.exe ( mkdir /S \%SOLARENV\\\%OUTPATH\\bin \^ copy dmake\\dmake.exe \%SOLARENV\\\%OUTPATH\\bin\\dmake.exe )", $empty, "x"); ToFile( "if not exist \%SOLARENV\\\%OUTPATH\\bin\\dmake.exe ( mkdir /S \%SOLARENV\\\%OUTPATH\\bin \^ copy dmake\\dmake.exe \%SOLARENV\\\%OUTPATH\\bin\\dmake.exe )", $empty, "x");
ToFile( " ", $empty, "x"); ToFile( " ", $empty, "x");
} }
# on solaris, set GNUCOPY and GNUPATCH # on Solaris and FreeBSD, set GNUCOPY and GNUPATCH
if ($platform eq "$Solaris") if ($platform eq "$Solaris" or $platform eq "$FreeBSD")
{ {
ToFile( "GNUPATCH", "@GNUPATCH@", "e"); ToFile( "GNUPATCH", "@GNUPATCH@", "e");
ToFile( "GNUCOPY", "@GNUCP@", "e"); ToFile( "GNUCOPY", "@GNUCP@", "e");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment