diff options
-rwxr-xr-x | solenv/bin/build.pl | 6 | ||||
-rwxr-xr-x | solenv/bin/checkdll.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | solenv/bin/createpdbrelocators.pl | 15 | ||||
-rwxr-xr-x | solenv/bin/deliver.pl | 17 | ||||
-rwxr-xr-x | solenv/bin/gsicheck | 11 | ||||
-rwxr-xr-x | solenv/bin/localize | 11 | ||||
-rwxr-xr-x | solenv/bin/localize_sl | 11 | ||||
-rw-r--r-- | solenv/bin/modules/CreatePDBRelocators.pm | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | solenv/bin/modules/SourceConfig.pm | 6 | ||||
-rw-r--r-- | solenv/bin/modules/installer/downloadsigner.pm | 5 | ||||
-rw-r--r-- | solenv/bin/modules/installer/environment.pm | 1 | ||||
-rw-r--r-- | solenv/bin/modules/installer/ziplist.pm | 13 | ||||
-rwxr-xr-x | solenv/bin/receditor | 2 | ||||
-rw-r--r-- | solenv/inc/ant.mk | 2 | ||||
-rw-r--r-- | solenv/inc/installationtest.mk | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | solenv/inc/set_wntx64.mk | 2 | ||||
-rw-r--r-- | solenv/inc/settings.mk | 67 | ||||
-rw-r--r-- | solenv/inc/startup/startup.mk | 2 | ||||
-rw-r--r-- | solenv/inc/target.mk | 12 |
19 files changed, 64 insertions, 128 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 22db4032b39d..d6664a44530a 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -2298,7 +2298,6 @@ sub retrieve_build_list { my $solver_inc_dir = "$ENV{SOLARVER}/$ENV{OUTPATH}"; $solver_inc_dir .= $ENV{PROEXT} if (defined $ENV{PROEXT}); $solver_inc_dir .= '/inc'; - $solver_inc_dir .= $ENV{UPDMINOREXT} if (defined $ENV{UPDMINOREXT}); $solver_inc_dir .= "/$module"; $solver_inc_dir = correct_path($solver_inc_dir); $dead_parents{$module}++; @@ -2572,12 +2571,11 @@ sub read_ssolar_vars { $platform = $`; }; - my ($verswitch, $source_root, $cwsname); - $verswitch = "-ver $ENV{UPDMINOR}" if (defined $ENV{UPDMINOR}); + my ($source_root, $cwsname); $source_root = '-sourceroot' if (defined $ENV{SOURCE_ROOT_USED}); my $cws_name = "-cwsname $ENV{CWS_WORK_STAMP}" if (defined $ENV{CWS_WORK_STAMP}); - my $param = "-$ENV{WORK_STAMP} $verswitch $source_root $cws_name $pro $platform"; + my $param = "-$ENV{WORK_STAMP} $source_root $cws_name $pro $platform"; my $ss_command = "$perl $setsolar -file $tmp_file $param $nul"; if (system($ss_command)) { unlink $tmp_file; diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh index b7ad3d4628f0..42a6725750a4 100755 --- a/solenv/bin/checkdll.sh +++ b/solenv/bin/checkdll.sh @@ -33,7 +33,7 @@ set -- `getopt "L:" "$@"` || { exit 1 } -checkdll="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/checkdll" +checkdll="$SOLARVERSION/$INPATH/bin/checkdll" if [ -x $checkdll ]; then while : diff --git a/solenv/bin/createpdbrelocators.pl b/solenv/bin/createpdbrelocators.pl index 75047f3952f5..d32dd7d84508 100644..100755 --- a/solenv/bin/createpdbrelocators.pl +++ b/solenv/bin/createpdbrelocators.pl @@ -57,22 +57,13 @@ $id_str =~ /Revision:\s+(\S+)\s+\$/ print "$script_name -- version: $script_rev\n"; my $inpath = $ENV{INPATH}; -my $milestone = $ENV{UPDMINOR}; -my $milestoneext = $ENV{UPDMINOREXT}; -if ( $ARGV[0] ) { - if ( $milestone && ( $milestone ne $ARGV[0] ) ) { - die "Error: specified milestone $ARGV[0] does not match your environment"; - } - $milestone = $ARGV[0]; -} - -if ( !$inpath || !$milestone ) { - print STDERR "$script_name: INAPTH or UPDMINOR not set!\n"; +if ( !$inpath ) { + print STDERR "$script_name: INAPTH not set!\n"; exit(1); } my $relocators = CreatePDBRelocators->new(); -my $rc = $relocators->create_pdb_relocators($inpath, $milestoneext, ""); +my $rc = $relocators->create_pdb_relocators($inpath, "", ""); if ( !$rc ) { print STDERR "$script_name: creating PDB relocators failed!\n"; diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index 0a945bc4e408..55f6a9e6f0ab 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -463,8 +463,6 @@ sub init_globals my $inpath = $ENV{'INPATH'}; my $solarversion = $ENV{'SOLARVERSION'}; my $updater = $ENV{'UPDATER'}; - my $updminor = $ENV{'UPDMINOR'}; - my $updminorext = $ENV{'UPDMINOREXT'}; my $work_stamp = $ENV{'WORK_STAMP'}; # special security check for release engineers @@ -486,9 +484,6 @@ sub init_globals } $ext = ""; - if ( ($updminor) && !$dest ) { - $ext = "$updminorext"; - } # Do we have common trees? if ( defined($ENV{'common_build'}) && $ENV{'common_build'} eq 'TRUE' ) { @@ -1119,20 +1114,8 @@ sub push_on_ziplist return if ( $opt_check ); # strip $dest from path since we don't want to record it in zip file if ( $file =~ s#^\Q$dest\E/##o ) { - if ( $updminor ){ - # strip minor from path - my $ext = "%_EXT%"; - $ext = expand_macros($ext); - $file =~ s#^$ext##o; - } push(@zip_list, $file); } elsif ( $file =~ s#^\Q$common_dest\E/##o ) { - if ( $updminor ){ - # strip minor from path - my $ext = "%_EXT%"; - $ext = expand_macros($ext); - $file =~ s#^$ext##o; - } push(@common_zip_list, $file); } } diff --git a/solenv/bin/gsicheck b/solenv/bin/gsicheck index fb2f65cbe01d..5a09880b9014 100755 --- a/solenv/bin/gsicheck +++ b/solenv/bin/gsicheck @@ -5,14 +5,9 @@ exit 1 fi if [ "${OS?}" = MACOSX ]; then - export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT} + export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib else - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT} -fi - -if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx ]; then - exec $SOLARVERSION/$INPATH/bin/gsicheck "$@" -else - exec $SOLARVERSION/$INPATH/bin$UPDMINOREXT/gsicheck "$@" + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib fi +exec $SOLARVERSION/$INPATH/bin/gsicheck "$@" diff --git a/solenv/bin/localize b/solenv/bin/localize index ef5550e72e67..9504e8ee37ed 100755 --- a/solenv/bin/localize +++ b/solenv/bin/localize @@ -7,14 +7,9 @@ fi # localize.pl calls localize_sl in solver bin directory which depends on dynamic # libraries in solver lib directory but has no correct RPATH (or equivalent): if [ "${OS?}" = MACOSX ]; then - export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT} + export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib else - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT} -fi - -if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx ]; then - exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@" -else - exec perl -w $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize.pl "$@" + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib fi +exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@" diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl index af7f8351406c..d0db56084a19 100755 --- a/solenv/bin/localize_sl +++ b/solenv/bin/localize_sl @@ -5,14 +5,9 @@ exit 1 fi if [ "${OS?}" = MACOSX ]; then - export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT} + export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib else - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT} -fi - -if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx ]; then - exec $SOLARVERSION/$INPATH/bin/localize_sl "$@" -else - exec $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize_sl "$@" + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib fi +exec $SOLARVERSION/$INPATH/bin/localize_sl "$@" diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm index 753075a2bfea..fc488ca3b037 100644 --- a/solenv/bin/modules/CreatePDBRelocators.pm +++ b/solenv/bin/modules/CreatePDBRelocators.pm @@ -76,11 +76,6 @@ sub new } my $SourceConfigObj = SourceConfig->new(); @repos = $SourceConfigObj->get_repositories(); - if ( defined $ENV{UPDMINOREXT} ) { - foreach my $onedir ( @repos ) { - push( @basedirs, $onedir.$ENV{UPDMINOREXT} ); - } - } # basdirs is repositories (dmake) + workdir (gnu make) push(@basedirs, $relworkdir); if (!scalar @basedirs) { diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index 5861ece08967..5ca61b5c2c9f 100755..100644 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm @@ -317,12 +317,6 @@ sub read_config_file { if (/\s*(\S+)=active\s*(\s+#)*/) { if ($repository_section) { my $repository_source_path = $self->{SOURCE_ROOT} . "/$1"; - if (defined $ENV{UPDMINOREXT}) { - $repository_source_path .= $ENV{UPDMINOREXT}; - if (defined ${$self->{REPOSITORIES}}{$1.$ENV{UPDMINOREXT}}) { - delete ${$self->{REPOSITORIES}}{$1.$ENV{UPDMINOREXT}}; - }; - }; ${$self->{REPOSITORIES}}{$1} = $repository_source_path; ${$self->{ACTIVATED_REPOSITORIES}}{$1}++; next; diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm index a01658959c44..8a63242e0685 100644 --- a/solenv/bin/modules/installer/downloadsigner.pm +++ b/solenv/bin/modules/installer/downloadsigner.pm @@ -411,6 +411,11 @@ sub filter_all_files_with_correct_settings my $workstamp = ""; if ( $ENV{'WORK_STAMP'} ) { $workstamp = $ENV{'WORK_STAMP'}; } + + # This is broken, we don't want to support any UPDMINOR + # complexities in LibreOffice. (Or do we?) This needs updating if + # we want to actually use this file for signing. + if ( $ENV{'UPDMINOR'} ) { $minor = $ENV{'UPDMINOR'}; } if ( $minor eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"UPDMINOR\" not set!", "filter_all_files_with_correct_settings"); } diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index 5c8c4ab25e40..c80d8375f3c2 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -111,7 +111,6 @@ sub set_global_environment_variables $installer::globals::build = $environment->{'WORK_STAMP'}; $installer::globals::compiler = $environment->{'OUTPATH'}; - if ( $ENV{'UPDMINOR'} ) { $installer::globals::minor = $ENV{'UPDMINOR'}; } if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; } if ( $ENV{'PROEXT'} ) { $installer::globals::pro = 1; } diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 629f947b3e3c..d52e97bf4e87 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -489,17 +489,8 @@ sub replace_minor_in_pathes { my $line = ${$patharrayref}[$i]; - if ( ! defined $ENV{CWS_WORK_STAMP} and defined $ENV{UPDMINOR} ) - { - $line =~ s/\{minor\}/$installer::globals::minor/g; - # no difference for minor and minornonpre (ToDo ?) - $line =~ s/\{minornonpre\}/$installer::globals::minor/g; - } - else # building without a minor - { - $line =~ s/\.\{minor\}//g; - $line =~ s/\.\{minornonpre\}//g; - } + $line =~ s/\.\{minor\}//g; + $line =~ s/\.\{minornonpre\}//g; ${$patharrayref}[$i] = $line; } diff --git a/solenv/bin/receditor b/solenv/bin/receditor index 1b4046010485..d0549c6c79ab 100755 --- a/solenv/bin/receditor +++ b/solenv/bin/receditor @@ -3,4 +3,4 @@ if [ x${SOLARENV}x = xx ]; then echo No environment found, please use 'configure' or 'setsolar' exit 1 fi -exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/receditor.jar +exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -jar ${SOLARVER}/${INPATH}/bin/receditor.jar diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk index 1ffa7fd39123..dd86f7e4a825 100644 --- a/solenv/inc/ant.mk +++ b/solenv/inc/ant.mk @@ -53,7 +53,7 @@ CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA # --- TARGETS ----------------------------------------------------- -$(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg $(SOLARENV)/inc/ant.properties +$(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg $(SOLARENV)/inc/ant.properties @echo "Making: " $@ @echo solar.build=$(BUILD) > $@ @echo solar.rscversion=$(USQ)$(RSCVERSION)$(USQ) >> $@ diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index 4c9fbae5072c..bc4baa85bb12 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -61,7 +61,7 @@ installationtest_instset = \ .IF "$(OS)" == "WNT" installationtest_instpath = `cat $(MISC)/$(TARGET)/installation.flag` .ELSE -installationtest_instpath = $(SOLARVERSION)/$(INPATH)/installation$(UPDMINOREXT) +installationtest_instpath = $(SOLARVERSION)/$(INPATH)/installation .END .IF "$(OS)" == "MACOSX" diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index e14c94de5719..0cad0a3a7f35 100755..100644 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_wntx64.mk @@ -157,7 +157,7 @@ L_X64=$(SOLARLIBDIR_X64) VERSIONOBJ_X64=$(SLO_X64)/_version.obj BIN_X64=$(BIN)/x64 RES_X64=$(RES)/x64 -SOLARLIBDIR_X64=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)/x64 +SOLARLIBDIR_X64=$(SOLARVERSION)/$(INPATH)/lib/x64 LIB_X64:=$(LB_X64);$(SLB_X64);$(ILIB_X64) .IF "$(LIBTARGET)"=="" diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index a694295baf1c..ebfd2a93fa32 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -64,16 +64,16 @@ EXTNAME*=$(EXTENSIONNAME)_in WRONG_SOURCEVERSION .ENDIF -# Create $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk if needed +# Create $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk if needed %minor.mk : $(SOLARENV)/inc/minor.mk - @@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT) - @@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk - @@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg + @@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc + @@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk + @@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg .ENDIF # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!="" -# Force creation of $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/ +# Force creation of $(SOLARVERSION)/$(INPATH)/inc/ # $(UPD)minor.mk could be empty as it's contents were already included from minor.mk -.INCLUDE : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk +.INCLUDE : $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk .IF "$(BSCLIENT)"=="TRUE" .IF "$(UPDATER)"!="YES" @@ -767,39 +767,34 @@ BIN=$(PRJ)/$(OUTPATH).xl/bin # damit gezielt Abhaengigkeiten auf s: angegeben werden koennen .IF "$(common_build)"!="" -SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl$(UPDMINOREXT) +SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl .ELSE -SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(UPDMINOREXT) +SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl .ENDIF -#.IF "$(UPDMINOR)" != "" -#UPDMINOREXT=.$(UPDMINOR) -#.ELSE -#UPDMINOREXT= -#.ENDIF -SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT) -SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT) -SOLARLIBDIR=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) -SOLARJAVADIR=$(SOLARVERSION)/$(INPATH)/java$(UPDMINOREXT) -SOLARINCDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT) -SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT) +SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res +SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res +SOLARLIBDIR=$(SOLARVERSION)/$(INPATH)/lib +SOLARJAVADIR=$(SOLARVERSION)/$(INPATH)/java +SOLARINCDIR=$(SOLARVERSION)/$(INPATH)/inc +SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc .IF "$(SOLARLANG)"!="deut" .IF "$(SOLARLANG)" != "" -SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(SOLARLANG) -SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT)/$(SOLARLANG) -.ENDIF -.ENDIF -SOLARBINDIR:=$(SOLARVERSION)/$(INPATH)/bin$(UPDMINOREXT) -SOLARUCRDIR=$(SOLARVERSION)/$(INPATH)/ucr$(UPDMINOREXT) -SOLARPARDIR=$(SOLARVERSION)/$(INPATH)/par$(UPDMINOREXT) -SOLARXMLDIR=$(SOLARVERSION)/$(INPATH)/xml$(UPDMINOREXT) -SOLARDOCDIR=$(SOLARVERSION)/$(INPATH)/doc$(UPDMINOREXT) -SOLARPCKDIR=$(SOLARVERSION)/$(INPATH)/pck$(UPDMINOREXT) -SOLARSDFDIR=$(SOLARVERSION)/$(INPATH)/sdf$(UPDMINOREXT) -SOLARCOMMONBINDIR=$(SOLARVERSION)/common$(PROEXT)/bin$(UPDMINOREXT) -SOLARCOMMONRESDIR=$(SOLARVERSION)/common$(PROEXT)/res$(UPDMINOREXT) -SOLARCOMMONPCKDIR=$(SOLARVERSION)/common$(PROEXT)/pck$(UPDMINOREXT) -SOLARCOMMONSDFDIR=$(SOLARVERSION)/common$(PROEXT)/sdf$(UPDMINOREXT) +SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc/$(SOLARLANG) +SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res/$(SOLARLANG) +.ENDIF +.ENDIF +SOLARBINDIR:=$(SOLARVERSION)/$(INPATH)/bin +SOLARUCRDIR=$(SOLARVERSION)/$(INPATH)/ucr +SOLARPARDIR=$(SOLARVERSION)/$(INPATH)/par +SOLARXMLDIR=$(SOLARVERSION)/$(INPATH)/xml +SOLARDOCDIR=$(SOLARVERSION)/$(INPATH)/doc +SOLARPCKDIR=$(SOLARVERSION)/$(INPATH)/pck +SOLARSDFDIR=$(SOLARVERSION)/$(INPATH)/sdf +SOLARCOMMONBINDIR=$(SOLARVERSION)/common$(PROEXT)/bin +SOLARCOMMONRESDIR=$(SOLARVERSION)/common$(PROEXT)/res +SOLARCOMMONPCKDIR=$(SOLARVERSION)/common$(PROEXT)/pck +SOLARCOMMONSDFDIR=$(SOLARVERSION)/common$(PROEXT)/sdf .IF "$(common_build)"=="" SOLARCOMMONBINDIR=$(SOLARBINDIR) SOLARCOMMONRESDIR=$(SOLARRESDIR) @@ -912,9 +907,9 @@ CDEFSOPT=-DOPTIMIZE MKDEPFLAGS+=-I$(INCDEPN:s/ / -I/:s/-I-I/-I/) MKDEPALLINC=$(SOLARINC:s/-I/ -I/) -MKDEPPREINC=-I$(PREPATH)/$(INPATH)/inc$(UPDMINOREXT) +MKDEPPREINC=-I$(PREPATH)/$(INPATH)/inc MKDEPSOLENV=-I$(SOLARENV)/inc -I$(SOLARENV)/$(GUI)$(COMEX)/inc -MKDEPSOLVER=-I$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT) -I$(SOLARVERSION)/$(INPATH)/inc +MKDEPSOLVER=-I$(SOLARVERSION)/$(INPATH)/inc MKDEPLOCAL=-I$(INCCOM) .IF "$(MKDEPENDALL)"!="" diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk index 02bd45fb18ce..bd028d835921 100644 --- a/solenv/inc/startup/startup.mk +++ b/solenv/inc/startup/startup.mk @@ -30,7 +30,7 @@ CALLMACROS:=$(MAKEMACROS) CALLTARGETS=$(MAKETARGETS) .ENDIF # "$(TNR)" == "" -.INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) $(SOLARENV)$/inc +.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 SO3 ENVCFLAGS diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 8b5902fede73..3824bdfdebf1 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -1032,7 +1032,7 @@ ALL_JAVA_TARGETS= \ .IF "$(lintit)"=="" .IF "$(L10N_framework)"!="" ALLTAR: \ - "$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk" \ + "$(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk" \ $(SUBDIRS) \ $(DPRTARGET) \ $(DPZTARGET) \ @@ -1080,7 +1080,7 @@ ALLTAR: \ .ELSE # "$(L10N_framework)"!="" ALLTAR: \ - "$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk" \ + "$(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk" \ $(MAKEDEMODIR) $(MAKECOMPDIR) $(MAKEXLDIR) \ $(COMPVERMK) \ $(JAVAVERMK) \ @@ -1419,7 +1419,7 @@ $(SCP_PRODUCT_TYPE): .ENDIF # "$(PARFILES)"!="" -"$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg" : +"$(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg" : $(TOUCH) $@ .IF "$(COMPVERMK)"!="" @@ -1428,7 +1428,7 @@ $(SCP_PRODUCT_TYPE): COMPVERMK_PHONY:=.PHONY .ENDIF # "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)" COMPVTMP:=$(mktmp iii) -"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg +"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg .IF "$(CCNUMVER)"!="" @echo COMNAME:=$(COMNAME) > $(COMPVTMP) @echo COMID:=$(COMID) >> $(COMPVTMP) @@ -1456,7 +1456,7 @@ COMPVTMP:=$(mktmp iii) .IF "$(JAVALOCATION)"!="$(JAVA_HOME)" "$(JAVAVERMK)" .PHONY : .ELSE # "$(JAVALOCATION)"!="$(JAVA_HOME)" -"$(JAVAVERMK)" : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg +"$(JAVAVERMK)" : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg .ENDIF # "$(JAVALOCATION)"!="$(JAVA_HOME)" @-$(RM) $@ @echo JAVAVER:=$(JAVAVER) > $@ @@ -1960,7 +1960,7 @@ $(MISC)/$(TARGET).dpz $(ZIPDEPPHONY) : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGE .ENDIF VERSIONTMP:=$(mktmp iii) -$(INCCOM)/%_version.h : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg +$(INCCOM)/%_version.h : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg @echo $(EMQ)#define _BUILD $(EMQ)"$(BUILD)$(EMQ)" > $(VERSIONTMP) @echo $(EMQ)#define _UPD $(EMQ)"$(UPD)$(EMQ)" >> $(VERSIONTMP) @echo $(EMQ)#define _LAST_MINOR $(EMQ)"$(LAST_MINOR)$(EMQ)" >> $(VERSIONTMP) |