strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gnumake2: introduce WORKDIR and OUTDIR in environment

Browse source
This commit is contained in:
Hans-Joachim Lankenau 2010-11-18 17:11:41 +01:00
parent 7e2a3c097f
commit e591852a04
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
set_soenv.in
View file

@ -79,7 +79,7 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV
# Environment variables.
my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
$UPD, $WORK_STAMP, $SOURCE_ROOT_DIR ,
$SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV,
$SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, $SOLARENV,
$STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI,
$DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
$MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
@ -1009,6 +1009,10 @@ else
#Location of Solar version.
$SOLARVERSION = '$SOLARVER';
#Location of gnu make directories.
$WORKDIR = '$SOLARVER/$INPATH/workdir';
$OUTDIR = '$SOLARVER/$INPATH';
$SOLARENVINC = '$SOLARENV'.$INC;
# Location of
$LOCALINI = '$SOLARENV'.$CONFIG;
@ -1730,6 +1734,8 @@ ToFile( "UPD", $UPD, "e" );
ToFile( "WORK_STAMP", $WORK_STAMP, "e" );
ToFile( "SOLARVER", $SOLARVER, "e" );
ToFile( "SOLARVERSION", $SOLARVERSION, "e" );
ToFile( "WORKDIR", $WORKDIR, "e" );
ToFile( "OUTDIR", $OUTDIR, "e" );
ToFile( "SOLARENV", $SOLARENV, "e" );
ToFile( "SOLARENVINC", $SOLARENVINC, "e" );
ToFile( "LOCALINI", $LOCALINI, "e" );

6
solenv/config/sdev300.ini
View file

@ -204,6 +204,9 @@ finish
SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
ANT_HOME %COMMON_BUILD_TOOLS%$/apache-ant-1.7.1
DBGSV_INIT %SOLARENV%/bin/dbgsv.ini
WORKDIR %SOLARVERSION%/%INPATH%/workdir
OUTDIR %SOLARVERSION%/%INPATH%
}
common_2:0 IF X%CWS_WORK_STAMP%X == XX
{
@ -214,7 +217,8 @@ finish
*o: cd %SOLARSRC%
ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so
TARFILE_LOCATION %SOURCE_ROOT_DIR%/ext_sources
gb_REPOS %SOURCE_ROOT_DIR%/ooo %SOURCE_ROOT_DIR%/sun
gb_REPOS %SOURCE_ROOT_DIR%/ooo %SOURCE_ROOT_DIR%/sun
gb_LOCALBUILDDIR %SOL_TMP%/gb_%CWS_WORK_STAMP%/%WORK_STAMP%
}
common_jre:0 IF %JREPATH% ==
{

1
solenv/config/ssolar.cmn
View file

@ -21,6 +21,7 @@ common
*dmake
*copyprj
__mgrdir
gb_LOCALBUILDDIR
product
rsc_once
wrapper_override_cc_wrapper