diff options
| -rwxr-xr-x | solenv/bin/deliver.pl | 8 | ||||
| -rwxr-xr-x | solenv/bin/packimages.pl | 8 | ||||
| -rw-r--r-- | solenv/inc/_tg_rslb.mk | 250 | ||||
| -rw-r--r-- | solenv/inc/tg_rslb.mk | 29 |
4 files changed, 32 insertions, 263 deletions
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index b579e4ff2f63..6c9b39b0c417 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -5,9 +5,9 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # $RCSfile: deliver.pl,v $ # -# $Revision: 1.65 $ +# $Revision: 1.66 $ # -# last change: $Author: rt $ $Date: 2004-05-27 14:49:44 $ +# last change: $Author: hjs $ $Date: 2004-05-27 15:04:22 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -78,7 +78,7 @@ use File::Spec; ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; -$id_str = ' $Revision: 1.65 $ '; +$id_str = ' $Revision: 1.66 $ '; $id_str =~ /Revision:\s+(\S+)\s+\$/ ? ($script_rev = $1) : ($script_rev = "-"); @@ -111,7 +111,7 @@ $module = 0; # module name $base_dir = 0; # path to module base directory $dlst_file = 0; # path to d.lst @ilst_file = (); # array of pathes to image lists -$ilst_ext = 'ilst2'; # extension of image lists +$ilst_ext = 'ilst'; # extension of image lists $umask = 22; # default file/directory creation mask $dest = 0; # optional destination path $common_build = 0; # do we have common trees? diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl index b1783fd2c96f..9d0da74b1411 100755 --- a/solenv/bin/packimages.pl +++ b/solenv/bin/packimages.pl @@ -5,9 +5,9 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # $RCSfile: packimages.pl,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: rt $ $Date: 2004-05-21 13:46:13 $ +# last change: $Author: hjs $ $Date: 2004-05-27 15:04:22 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -91,7 +91,7 @@ my $extra_verbose; # be extra verbose ( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; my $script_rev; -my $id_str = ' $Revision: 1.2 $ '; +my $id_str = ' $Revision: 1.3 $ '; $id_str =~ /Revision:\s+(\S+)\s+\$/ ? ($script_rev = $1) : ($script_rev = "-"); @@ -148,7 +148,7 @@ sub parse_options sub get_image_lists { - my @image_lists = glob("$imagelist_path/*.ilst2"); + my @image_lists = glob("$imagelist_path/*.ilst"); if ( !@image_lists ) { print_error("can't find any image lists in '$imagelist_path'", 3); diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk index 17ea60e07518..b488fb4bb423 100644 --- a/solenv/inc/_tg_rslb.mk +++ b/solenv/inc/_tg_rslb.mk @@ -19,27 +19,6 @@ ALLTAR : $(HIDRES1PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -.IF "$(common_build_reslib)"!="" -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION).ilst2 : $(RSC_MULTI1) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION).ilst2 -.ELSE # "$(common_build_reslib)"!="" -$(BIN)$/$(RESLIB1NAME)$(RESLIB1VERSION).ilst2 : $(RSC_MULTI1) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(BIN)$/$(RESLIB1NAME)$(RESLIB1VERSION).ilst2 -.ENDIF # "$(common_build_reslib)"!="" - - $(RSC_MULTI1) : \ $(RESLIB1SRSFILES) \ $(RESLIB1TARGETN) \ @@ -54,7 +33,7 @@ $(RSC_MULTI1) : \ $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subGLOBAL=$(SOLARSRC) \ -subCUSTOM=to_be_defined \ -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -72,7 +51,7 @@ $(RSC_MULTI1) : \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ -subGLOBAL=$(SOLARSRC) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subCUSTOM=to_be_defined \ -oil$(BIN) \ -ft$@ \ @@ -123,27 +102,6 @@ ALLTAR : $(HIDRES2PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -.IF "$(common_build_reslib)"!="" -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION).ilst2 : $(RSC_MULTI2) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION).ilst2 -.ELSE # "$(common_build_reslib)"!="" -$(BIN)$/$(RESLIB2NAME)$(RESLIB2VERSION).ilst2 : $(RSC_MULTI2) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(BIN)$/$(RESLIB2NAME)$(RESLIB2VERSION).ilst2 -.ENDIF # "$(common_build_reslib)"!="" - - $(RSC_MULTI2) : \ $(RESLIB2SRSFILES) \ $(RESLIB2TARGETN) \ @@ -158,7 +116,7 @@ $(RSC_MULTI2) : \ $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subGLOBAL=$(SOLARSRC) \ -subCUSTOM=to_be_defined \ -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -176,7 +134,7 @@ $(RSC_MULTI2) : \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ -subGLOBAL=$(SOLARSRC) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subCUSTOM=to_be_defined \ -oil$(BIN) \ -ft$@ \ @@ -227,27 +185,6 @@ ALLTAR : $(HIDRES3PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -.IF "$(common_build_reslib)"!="" -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION).ilst2 : $(RSC_MULTI3) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION).ilst2 -.ELSE # "$(common_build_reslib)"!="" -$(BIN)$/$(RESLIB3NAME)$(RESLIB3VERSION).ilst2 : $(RSC_MULTI3) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(BIN)$/$(RESLIB3NAME)$(RESLIB3VERSION).ilst2 -.ENDIF # "$(common_build_reslib)"!="" - - $(RSC_MULTI3) : \ $(RESLIB3SRSFILES) \ $(RESLIB3TARGETN) \ @@ -262,7 +199,7 @@ $(RSC_MULTI3) : \ $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subGLOBAL=$(SOLARSRC) \ -subCUSTOM=to_be_defined \ -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -280,7 +217,7 @@ $(RSC_MULTI3) : \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ -subGLOBAL=$(SOLARSRC) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subCUSTOM=to_be_defined \ -oil$(BIN) \ -ft$@ \ @@ -331,27 +268,6 @@ ALLTAR : $(HIDRES4PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -.IF "$(common_build_reslib)"!="" -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION).ilst2 : $(RSC_MULTI4) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION).ilst2 -.ELSE # "$(common_build_reslib)"!="" -$(BIN)$/$(RESLIB4NAME)$(RESLIB4VERSION).ilst2 : $(RSC_MULTI4) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(BIN)$/$(RESLIB4NAME)$(RESLIB4VERSION).ilst2 -.ENDIF # "$(common_build_reslib)"!="" - - $(RSC_MULTI4) : \ $(RESLIB4SRSFILES) \ $(RESLIB4TARGETN) \ @@ -366,7 +282,7 @@ $(RSC_MULTI4) : \ $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subGLOBAL=$(SOLARSRC) \ -subCUSTOM=to_be_defined \ -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -384,7 +300,7 @@ $(RSC_MULTI4) : \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ -subGLOBAL=$(SOLARSRC) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subCUSTOM=to_be_defined \ -oil$(BIN) \ -ft$@ \ @@ -435,27 +351,6 @@ ALLTAR : $(HIDRES5PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -.IF "$(common_build_reslib)"!="" -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION).ilst2 : $(RSC_MULTI5) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION).ilst2 -.ELSE # "$(common_build_reslib)"!="" -$(BIN)$/$(RESLIB5NAME)$(RESLIB5VERSION).ilst2 : $(RSC_MULTI5) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(BIN)$/$(RESLIB5NAME)$(RESLIB5VERSION).ilst2 -.ENDIF # "$(common_build_reslib)"!="" - - $(RSC_MULTI5) : \ $(RESLIB5SRSFILES) \ $(RESLIB5TARGETN) \ @@ -470,7 +365,7 @@ $(RSC_MULTI5) : \ $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subGLOBAL=$(SOLARSRC) \ -subCUSTOM=to_be_defined \ -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -488,7 +383,7 @@ $(RSC_MULTI5) : \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ -subGLOBAL=$(SOLARSRC) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subCUSTOM=to_be_defined \ -oil$(BIN) \ -ft$@ \ @@ -539,27 +434,6 @@ ALLTAR : $(HIDRES6PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -.IF "$(common_build_reslib)"!="" -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION).ilst2 : $(RSC_MULTI6) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION).ilst2 -.ELSE # "$(common_build_reslib)"!="" -$(BIN)$/$(RESLIB6NAME)$(RESLIB6VERSION).ilst2 : $(RSC_MULTI6) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(BIN)$/$(RESLIB6NAME)$(RESLIB6VERSION).ilst2 -.ENDIF # "$(common_build_reslib)"!="" - - $(RSC_MULTI6) : \ $(RESLIB6SRSFILES) \ $(RESLIB6TARGETN) \ @@ -574,7 +448,7 @@ $(RSC_MULTI6) : \ $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subGLOBAL=$(SOLARSRC) \ -subCUSTOM=to_be_defined \ -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -592,7 +466,7 @@ $(RSC_MULTI6) : \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ -subGLOBAL=$(SOLARSRC) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subCUSTOM=to_be_defined \ -oil$(BIN) \ -ft$@ \ @@ -643,27 +517,6 @@ ALLTAR : $(HIDRES7PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -.IF "$(common_build_reslib)"!="" -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION).ilst2 : $(RSC_MULTI7) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION).ilst2 -.ELSE # "$(common_build_reslib)"!="" -$(BIN)$/$(RESLIB7NAME)$(RESLIB7VERSION).ilst2 : $(RSC_MULTI7) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(BIN)$/$(RESLIB7NAME)$(RESLIB7VERSION).ilst2 -.ENDIF # "$(common_build_reslib)"!="" - - $(RSC_MULTI7) : \ $(RESLIB7SRSFILES) \ $(RESLIB7TARGETN) \ @@ -678,7 +531,7 @@ $(RSC_MULTI7) : \ $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subGLOBAL=$(SOLARSRC) \ -subCUSTOM=to_be_defined \ -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -696,7 +549,7 @@ $(RSC_MULTI7) : \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ -subGLOBAL=$(SOLARSRC) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subCUSTOM=to_be_defined \ -oil$(BIN) \ -ft$@ \ @@ -747,27 +600,6 @@ ALLTAR : $(HIDRES8PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -.IF "$(common_build_reslib)"!="" -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION).ilst2 : $(RSC_MULTI8) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION).ilst2 -.ELSE # "$(common_build_reslib)"!="" -$(BIN)$/$(RESLIB8NAME)$(RESLIB8VERSION).ilst2 : $(RSC_MULTI8) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(BIN)$/$(RESLIB8NAME)$(RESLIB8VERSION).ilst2 -.ENDIF # "$(common_build_reslib)"!="" - - $(RSC_MULTI8) : \ $(RESLIB8SRSFILES) \ $(RESLIB8TARGETN) \ @@ -782,7 +614,7 @@ $(RSC_MULTI8) : \ $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subGLOBAL=$(SOLARSRC) \ -subCUSTOM=to_be_defined \ -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -800,7 +632,7 @@ $(RSC_MULTI8) : \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ -subGLOBAL=$(SOLARSRC) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subCUSTOM=to_be_defined \ -oil$(BIN) \ -ft$@ \ @@ -851,27 +683,6 @@ ALLTAR : $(HIDRES9PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -.IF "$(common_build_reslib)"!="" -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION).ilst2 : $(RSC_MULTI9) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION).ilst2 -.ELSE # "$(common_build_reslib)"!="" -$(BIN)$/$(RESLIB9NAME)$(RESLIB9VERSION).ilst2 : $(RSC_MULTI9) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(BIN)$/$(RESLIB9NAME)$(RESLIB9VERSION).ilst2 -.ENDIF # "$(common_build_reslib)"!="" - - $(RSC_MULTI9) : \ $(RESLIB9SRSFILES) \ $(RESLIB9TARGETN) \ @@ -886,7 +697,7 @@ $(RSC_MULTI9) : \ $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subGLOBAL=$(SOLARSRC) \ -subCUSTOM=to_be_defined \ -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -904,7 +715,7 @@ $(RSC_MULTI9) : \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ -subGLOBAL=$(SOLARSRC) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subCUSTOM=to_be_defined \ -oil$(BIN) \ -ft$@ \ @@ -955,27 +766,6 @@ ALLTAR : $(HIDRES10PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -.IF "$(common_build_reslib)"!="" -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION).ilst2 : $(RSC_MULTI10) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION).ilst2 -.ELSE # "$(common_build_reslib)"!="" -$(BIN)$/$(RESLIB10NAME)$(RESLIB10VERSION).ilst2 : $(RSC_MULTI10) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(BIN)$/$(RESLIB10NAME)$(RESLIB10VERSION).ilst2 -.ENDIF # "$(common_build_reslib)"!="" - - $(RSC_MULTI10) : \ $(RESLIB10SRSFILES) \ $(RESLIB10TARGETN) \ @@ -990,7 +780,7 @@ $(RSC_MULTI10) : \ $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subGLOBAL=$(SOLARSRC) \ -subCUSTOM=to_be_defined \ -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -1008,7 +798,7 @@ $(RSC_MULTI10) : \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ -subGLOBAL=$(SOLARSRC) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subCUSTOM=to_be_defined \ -oil$(BIN) \ -ft$@ \ diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk index 5bca82017fd4..fcc39def6fc6 100644 --- a/solenv/inc/tg_rslb.mk +++ b/solenv/inc/tg_rslb.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_rslb.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: rt $ $Date: 2004-05-21 13:47:11 $ +# last change: $Author: hjs $ $Date: 2004-05-27 15:06:32 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -111,27 +111,6 @@ ALLTAR : $(HIDRES$(TNR)PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -.IF "$(common_build_reslib)"!="" -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION).ilst2 : $(RSC_MULTI$(TNR)) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION).ilst2 -.ELSE # "$(common_build_reslib)"!="" -$(BIN)$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION).ilst2 : $(RSC_MULTI$(TNR)) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(BIN)$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION).ilst2 -.ENDIF # "$(common_build_reslib)"!="" - - $(RSC_MULTI$(TNR)) : \ $(RESLIB$(TNR)SRSFILES) \ $(RESLIB$(TNR)TARGETN) \ @@ -146,7 +125,7 @@ $(RSC_MULTI$(TNR)) : \ $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subGLOBAL=$(SOLARSRC) \ -subCUSTOM=to_be_defined \ -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -164,7 +143,7 @@ $(RSC_MULTI$(TNR)) : \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ -subGLOBAL=$(SOLARSRC) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subCUSTOM=to_be_defined \ -oil$(BIN) \ -ft$@ \ |