Skip to content

C
core
Kaydet (Commit) 5f03eb4b authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

The common_build stuff is surely obsolete

üst cef915c3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 246 deletions
desktop/test/deployment/locationtest/makefile.mk
Dosyayı görüntüle @ 5f03eb4b
......@@ -30,8 +30,6 @@ PRJNAME = location_test
PACKAGE = com$/sun$/star$/comp$/smoketest
TARGET = com_sun_star_comp_smoketest
no_common_build_zip:=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
......
desktop/test/deployment/update/updateinfocreation/build/makefile.mk
Dosyayı görüntüle @ 5f03eb4b
......@@ -30,8 +30,6 @@ PRJNAME = updateinfo
PACKAGE = com$/sun$/star$/comp$/smoketest
TARGET = com_sun_star_comp_smoketest
no_common_build_zip:=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
......
instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
Dosyayı görüntüle @ 5f03eb4b
......@@ -32,7 +32,6 @@ TARGET=win_ulffiles
# --- Settings -----------------------------------------------------
common_build:=
.INCLUDE : settings.mk
# ------------------------------------------------------------------
......
migrationanalysis/util/makefile.mk
Dosyayı görüntüle @ 5f03eb4b
......@@ -30,8 +30,6 @@ PRJ=..
PRJNAME=migrationanalysis
TARGET=paw
no_common_build_zip=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
......
reportbuilder/template/makefile.mk
Dosyayı görüntüle @ 5f03eb4b
......@@ -30,7 +30,6 @@ PRJNAME=reportbuilder
TARGET=rpt_templates
# ???
no_common_build_zip=true
EXTENSION_VERSION_BASE=1.0.0
.IF "$(DBG_LEVEL)" == "0"
......
sdext/source/presenter/makefile.mk
Dosyayı görüntüle @ 5f03eb4b
......@@ -52,7 +52,6 @@ PACKAGE=com.sun.PresenterScreen-$(PLATFORMID)
.INCLUDE : $(PRJ)$/util$/makefile.pmk
DLLPRE=
common_build_zip=
# --- Files -------------------------------------
......
set_soenv.in
Dosyayı görüntüle @ 5f03eb4b
......@@ -46,7 +46,7 @@ my ( $oldoutfile, $outfile, $bootfile, $newline, $comment,
#
# Platform independent constant values.
my ( $CALL_CDECL, $COMMON_OUTDIR,
$common_build, $SOLAR_JAVA,
$SOLAR_JAVA,
$UPDATER, $VCL,
$CC, $CXX);
#
......@@ -167,7 +167,6 @@ chomp( $oldPATH ); # cut off new line
# NB: Language options now set at 'ToFile' stage.
$CALL_CDECL = "TRUE";
$COMMON_OUTDIR = "";
$common_build = "";
$SOLAR_JAVA = "@SOLAR_JAVA@";
$UPDATER = "YES";
$VCL = "TRUE";
......@@ -1436,7 +1435,6 @@ ToFile( "WITH_POOR_HELP_LOCALIZATIONS", $WITH_POOR_HELP_LOCALIZATIONS, "e" );
ToFile( "CALL_CDECL", $CALL_CDECL, "e" );
ToFile( "COMMON_OUTDIR", $COMMON_OUTDIR, "e" );
ToFile( "common_build", $common_build, "e" );
ToFile( "UPDATER", $UPDATER, "e" );
ToFile( "VCL", $VCL, "e" );
if ("@ENABLE_DEBUG@" eq "TRUE") {
......
smoketest/com/sun/star/comp/smoketest/makefile.mk
Dosyayı görüntüle @ 5f03eb4b
......@@ -30,8 +30,6 @@ PRJNAME = smoketestdoc
PACKAGE = com/sun/star/comp/smoketest
TARGET = com_sun_star_comp_smoketest
no_common_build_zip:=TRUE
# --- Settings -----------------------------------------------------
.IF "$(SOLAR_JAVA)" != ""
......
solenv/bin/deliver.pl
Dosyayı görüntüle @ 5f03eb4b
......@@ -74,7 +74,6 @@ $dlst_file = 0; # path to d.lst
$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?
$common_dest = 0; # common tree on solver
@action_data = (); # LoL with all action data
......@@ -175,17 +174,6 @@ sub do_copy
($from, $to) = split(' ', $dependent);
print "copy dependent: from: $from, to: $to\n" if $is_debug;
glob_and_copy($from, $to, $touch);
if ($delete_common && $common_build && ( $line !~ /%COMMON_OUTDIR%/ ) ) {
$line =~ s/%__SRC%/%COMMON_OUTDIR%/ig;
if ( $line =~ /%COMMON_OUTDIR%/ ) {
$line =~ s/%_DEST%/%COMMON_DEST%/ig;
$common = expand_macros($line);
($from, $to) = split(' ', $common);
print "copy common: from: $from, to: $to\n" if $is_debug;
glob_and_copy($from, $to, $touch);
}
}
}
sub do_dos
......@@ -459,26 +447,9 @@ sub init_globals
exit(3);
}
# Do we have common trees?
if ( defined($ENV{'common_build'}) && $ENV{'common_build'} eq 'TRUE' ) {
$common_build = 1;
if ((defined $common_outdir) && ($common_outdir ne "")) {
$common_outdir = $common_outdir . ".pro" if $inpath =~ /\.pro$/;
if ( $dest ) {
$common_dest = $dest;
} else {
$common_dest = "$solarversion/$common_outdir";
$dest = "$solarversion/$inpath";
}
} else {
print_error("common_build defined without common_outdir", 0);
exit(6);
}
} else {
$common_outdir = $inpath;
$dest = "$solarversion/$inpath" if ( !$dest );
$common_dest = $dest;
}
$common_outdir = $inpath;
$dest = "$solarversion/$inpath" if ( !$dest );
$common_dest = $dest;
$dest =~ s#\\#/#g;
$common_dest =~ s#\\#/#g;
......@@ -874,10 +845,6 @@ sub is_newer
if ( $from_stat[9] > $logfiledate ) {
$logfiledate = $from_stat[9];
}
} elsif ( $common_build && ( $to =~ /^\Q$common_dest\E/ ) ) {
if ( $from_stat[9] > $commonlogfiledate ) {
$commonlogfiledate = $from_stat[9];
}
}
@to_stat = stat($to.$maybedot);
......@@ -970,8 +937,8 @@ sub push_default_actions
'xml'
);
push(@subdirs, 'zip') if $opt_zip;
push(@subdirs, 'idl') if ! $common_build;
push(@subdirs, 'pus') if ! $common_build;
push(@subdirs, 'idl');
push(@subdirs, 'pus');
my @common_subdirs = (
'bin',
'idl',
......@@ -987,19 +954,9 @@ sub push_default_actions
foreach $subdir (@subdirs) {
push(@action_data, ['mkdir', "%_DEST%/$subdir"]);
}
if ( $common_build ) {
foreach $subdir (@common_subdirs) {
push(@action_data, ['mkdir', "%COMMON_DEST%/$subdir"]);
}
}
}
push(@action_data, ['mkdir', "%_DEST%/inc/$module"]);
if ( $common_build ) {
push(@action_data, ['mkdir', "%COMMON_DEST%/inc/$module"]);
push(@action_data, ['mkdir', "%COMMON_DEST%/res/img"]);
} else {
push(@action_data, ['mkdir', "%_DEST%/res/img"]);
}
push(@action_data, ['mkdir', "%_DEST%/res/img"]);
# need to copy libstaticmxp.dylib for Mac OS X
if ( $^O eq 'darwin' )
......@@ -1098,8 +1055,6 @@ sub push_on_loglist
my $common;
if ( $entry[2] =~ /^\Q$dest\E/ ) {
$common = 0;
} elsif ( $common_build && ( $entry[2] =~ /^\Q$common_dest\E/ )) {
$common = 1;
} else {
warn "Neither common nor platform tree?";
return;
......@@ -1128,18 +1083,10 @@ sub zip_files
my (%dest_dir, %list_ref);
$dest_dir{$platform_zip_file} = $dest;
$list_ref{$platform_zip_file} = \@zip_list;
if ( $common_build ) {
$common_zip_file = "%COMMON_DEST%/zip/$module.zip";
$common_zip_file = expand_macros($common_zip_file);
$dest_dir{$common_zip_file} = $common_dest;
$list_ref{$common_zip_file} = \@common_zip_list;
}
my @zipfiles;
$zipfiles[0] = $platform_zip_file;
if ( $common_build ) {
push @zipfiles, ($common_zip_file);
}
foreach my $zip_file ( @zipfiles ) {
print "ZIP: updating $zip_file\n" if $opt_verbose;
next if ( $opt_check );
......@@ -1258,7 +1205,6 @@ sub write_log
$file_date{\@common_log_list} = $commonlogfiledate;
my @logs = ( \@log_list );
push @logs, ( \@common_log_list ) if ( $common_build );
foreach my $log ( @logs ) {
$log_file{$log} = expand_macros( $log_file{$log} );
if ( $opt_delete ) {
......
solenv/inc/_tg_rslb.mk
Dosyayı görüntüle @ 5f03eb4b
This diff is collapsed.
solenv/inc/_tg_zip.mk
Dosyayı görüntüle @ 5f03eb4b
This diff is collapsed.
solenv/inc/extension_pre.mk
Dosyayı görüntüle @ 5f03eb4b
......@@ -47,7 +47,6 @@ COMPONENT_LIC_TEMPL*:=registration/LICENSE
.ENDIF
#TODO: check ZIP9TARGET for previous use!
common_build_zip=
MANIFEST_DEPS= $(PACKLICS) $(DESCRIPTION) $(COMPONENT_FILES) $(COMPONENT_LIBRARIES) $(COMPONENT_JARFILES) $(COMPONENT_MERGED_XCU) $(EXTENSION_PACKDEPS)
ZIP9DEPS= $(PACKLICS) $(DESCRIPTION) $(COMPONENT_XCU) $(COMPONENT_FILES) $(COMPONENT_LIBRARIES) $(COMPONENT_MANIFEST) $(COMPONENT_JARFILES) $(COMPONENT_MERGED_XCU) $(EXTENSION_PACKDEPS)
ZIP9TARGET= $(EXTENSION_ZIPNAME)
......
solenv/inc/pstrules.mk
Dosyayı görüntüle @ 5f03eb4b
......@@ -145,11 +145,7 @@ $(PAR)/%.par :
.IF "$(GUI)"=="UNX"
$(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
.ENDIF
.IF "$(common_build_srs)"!=""
$(COMMAND_ECHO)$(SCPCOMP) -l {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(TARGET)/$(@:b).$(LANGFILEEXT)} -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@
.ELSE # "$(common_build_srs)"!=""
$(COMMAND_ECHO)$(SCPCOMP) -l {$(MISC)/$(TARGET)/$(@:b).$(LANGFILEEXT)} -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@
.ENDIF # "$(common_build_srs)"!=""
# hacked version
# $(COMMAND_ECHO)$(SCPCOMP) -l $(@:b).$(LANGFILEEXT) -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@
......
solenv/inc/settings.mk
Dosyayı görüntüle @ 5f03eb4b
......@@ -366,12 +366,6 @@ COMPILER_WARN_ALL=TRUE
COMPILER_WARN_ERRORS=TRUE
.ENDIF
#.IF "$(COMMON_BUILD)"!=""
#common_build*=$(COMMON_BUILD)
#.ENDIF
common_build:=
COMMON_BUILD:=
.IF "$(USE_SHL_VERSIONS)"!=""
use_shl_versions*=$(USE_SHL_VERSIONS)
.ENDIF
......@@ -558,24 +552,7 @@ PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) && pwd $(PWDFLAGS))/, $(PWD))
PATH_IN_MODULE:=
.ENDIF # "$(PRJ)"!="."
## common output tree
#.IF "$(common_build)"!=""
#COMMON_OUTDIR*=common
#.IF "$(no_common_build_reslib)"==""
#common_build_reslib=true
#.ENDIF # "$(no_common_build_reslib)"==""
#.IF "$(no_common_build_zip)"==""
#common_build_zip=true
#.ENDIF # "$(no_common_build_zip)"==""
#.IF "$(no_common_build_sign_jar)"==""
#common_build_sign_jar=true
#.ENDIF # "$(no_common_build_sign_jar)"==""
#.IF "$(no_common_build_srs)"==""
#common_build_srs=true
#.ENDIF # "$(no_common_build_srs)"==""
#.ELSE # "$(common_build)"!=""
COMMON_OUTDIR:=$(OUTPATH)
#.ENDIF # "$(common_build)"!=""
LOCAL_OUT:=$(OUT)
LOCAL_OUT_FOR_BUILD:=$(OUT_FOR_BUILD)
......@@ -595,13 +572,6 @@ $(posix_PWD)/$(OUT)/inc/%world.mk :
.INCLUDE : $(posix_PWD)/$(OUT)/inc/myworld.mk
.IF "$(common_build)"!=""
$(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/%world.mk :
@$(MKOUT) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT))
@echo $(EMQ)# > $@
.INCLUDE : $(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/myworld.mk
.ENDIF # "$(common_build)"!=""
.ENDIF # "$(TARGET)"!="prj"
.INCLUDE .IGNORE : office.mk
......@@ -725,13 +695,8 @@ INCDEPN+=$(INCPRE)
# Resource-Pfad fuer .SRS
.IF "$(common_build_srs)"!=""
SRS=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))/srs
SRSX=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))/srs
.ELSE # "$(common_build_srs)"!=""
SRS=$(OUT)/srs
SRSX=$(OUT)/srs
.ENDIF # "$(common_build_srs)"!=""
# Resource-Pfad fuer .RC und .RES
RES=$(OUT)/res
......@@ -744,11 +709,7 @@ BIN=$(PRJ)/$(OUTPATH).xl/bin
# damit gezielt Abhaengigkeiten auf s: angegeben werden koennen
.IF "$(common_build)"!=""
SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl
.ELSE
SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl
.ENDIF
SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res
SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res
......@@ -774,12 +735,10 @@ 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)
SOLARCOMMONPCKDIR=$(SOLARPCKDIR)
SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
.ENDIF
.EXPORT : SOLARBINDIR
......
solenv/inc/target.mk
Dosyayı görüntüle @ 5f03eb4b
......@@ -787,13 +787,8 @@ LIB9ARCHIV=
.IF "$(RESLIB1NAME)" != ""
.IF "$(RESLIB1NOVERSION)"==""
.ENDIF # "$(RESLIB1NOVERSION)"==""
.IF "$(common_build_reslib)"!=""
RESLIB1TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)LANGEXT.res
RSC_MULTI1=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB1NAME)
.ELSE # "$(common_build_reslib)"!=""
RESLIB1TARGETN=$(BIN)/$(RESLIB1NAME)LANGEXT.res
RSC_MULTI1=$(MISC)/rsc_$(RESLIB1NAME)
.ENDIF # "$(common_build_reslib)"!=""
# change to iso if resmgr is changed
RESLIB1TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB1TARGETN)))
.ENDIF
......@@ -801,104 +796,64 @@ RESLIB1TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB1TARGETN))
.IF "$(RESLIB2NAME)" != ""
.IF "$(RESLIB2NOVERSION)"==""
.ENDIF # "$(RESLIB2NOVERSION)"==""
.IF "$(common_build_reslib)"!=""
RESLIB2TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)LANGEXT.res
RSC_MULTI2=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB2NAME)
.ELSE # "$(common_build_reslib)"!=""
RESLIB2TARGETN=$(BIN)/$(RESLIB2NAME)LANGEXT.res
RSC_MULTI2=$(MISC)/rsc_$(RESLIB2NAME)
.ENDIF # "$(common_build_reslib)"!=""
RESLIB2TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB2TARGETN)))
.ENDIF
.IF "$(RESLIB3NAME)" != ""
.IF "$(RESLIB3NOVERSION)"==""
.ENDIF # "$(RESLIB3NOVERSION)"==""
.IF "$(common_build_reslib)"!=""
RESLIB3TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)LANGEXT.res
RSC_MULTI3=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB3NAME)
.ELSE # "$(common_build_reslib)"!=""
RESLIB3TARGETN=$(BIN)/$(RESLIB3NAME)LANGEXT.res
RSC_MULTI3=$(MISC)/rsc_$(RESLIB3NAME)
.ENDIF # "$(common_build_reslib)"!=""
RESLIB3TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB3TARGETN)))
.ENDIF
.IF "$(RESLIB4NAME)" != ""
.IF "$(RESLIB4NOVERSION)"==""
.ENDIF # "$(RESLIB4NOVERSION)"==""
.IF "$(common_build_reslib)"!=""
RESLIB4TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)LANGEXT.res
RSC_MULTI4=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB4NAME)
.ELSE # "$(common_build_reslib)"!=""
RESLIB4TARGETN=$(BIN)/$(RESLIB4NAME)LANGEXT.res
RSC_MULTI4=$(MISC)/rsc_$(RESLIB4NAME)
.ENDIF # "$(common_build_reslib)"!=""
RESLIB4TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB4TARGETN)))
.ENDIF
.IF "$(RESLIB5NAME)" != ""
.IF "$(RESLIB5NOVERSION)"==""
.ENDIF # "$(RESLIB5NOVERSION)"==""
.IF "$(common_build_reslib)"!=""
RESLIB5TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)LANGEXT.res
RSC_MULTI5=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB5NAME)
.ELSE # "$(common_build_reslib)"!=""
RESLIB5TARGETN=$(BIN)/$(RESLIB5NAME)LANGEXT.res
RSC_MULTI5=$(MISC)/rsc_$(RESLIB5NAME)
.ENDIF # "$(common_build_reslib)"!=""
RESLIB5TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB5TARGETN)))
.ENDIF
.IF "$(RESLIB6NAME)" != ""
.IF "$(RESLIB6NOVERSION)"==""
.ENDIF # "$(RESLIB6NOVERSION)"==""
.IF "$(common_build_reslib)"!=""
RESLIB6TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)LANGEXT.res
RSC_MULTI6=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB6NAME)
.ELSE # "$(common_build_reslib)"!=""
RESLIB6TARGETN=$(BIN)/$(RESLIB6NAME)LANGEXT.res
RSC_MULTI6=$(MISC)/rsc_$(RESLIB6NAME)
.ENDIF # "$(common_build_reslib)"!=""
RESLIB6TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB6TARGETN)))
.ENDIF
.IF "$(RESLIB7NAME)" != ""
.IF "$(RESLIB7NOVERSION)"==""
.ENDIF # "$(RESLIB7NOVERSION)"==""
.IF "$(common_build_reslib)"!=""
RESLIB7TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)LANGEXT.res
RSC_MULTI7=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB7NAME)
.ELSE # "$(common_build_reslib)"!=""
RESLIB7TARGETN=$(BIN)/$(RESLIB7NAME)LANGEXT.res
RSC_MULTI7=$(MISC)/rsc_$(RESLIB7NAME)
.ENDIF # "$(common_build_reslib)"!=""
RESLIB7TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB7TARGETN)))
.ENDIF
.IF "$(RESLIB8NAME)" != ""
.IF "$(RESLIB8NOVERSION)"==""
.ENDIF # "$(RESLIB8NOVERSION)"==""
.IF "$(common_build_reslib)"!=""
RESLIB8TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)LANGEXT.res
RSC_MULTI8=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB8NAME)
.ELSE # "$(common_build_reslib)"!=""
RESLIB8TARGETN=$(BIN)/$(RESLIB8NAME)LANGEXT.res
RSC_MULTI8=$(MISC)/rsc_$(RESLIB8NAME)
.ENDIF # "$(common_build_reslib)"!=""
RESLIB8TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB8TARGETN)))
.ENDIF
.IF "$(RESLIB9NAME)" != ""
.IF "$(RESLIB9NOVERSION)"==""
.ENDIF # "$(RESLIB9NOVERSION)"==""
.IF "$(common_build_reslib)"!=""
RESLIB9TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)LANGEXT.res
RSC_MULTI9=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB9NAME)
.ELSE # "$(common_build_reslib)"!=""
RESLIB9TARGETN=$(BIN)/$(RESLIB9NAME)LANGEXT.res
RSC_MULTI9=$(MISC)/rsc_$(RESLIB9NAME)
.ENDIF # "$(common_build_reslib)"!=""
RESLIB9TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB9TARGETN)))
.ENDIF
......
solenv/inc/tg_rslb.mk
Dosyayı görüntüle @ 5f03eb4b
......@@ -35,22 +35,6 @@ $(RSC_MULTI$(TNR)) : \
$(RESLIB$(TNR)TARGETN) \
$(RESLIB$(TNR)BMPS)
@echo Compiling: $(@:f)
.IF "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-r -p \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB$(TNR)NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-subMODULE=$(SOLARDEFIMG) \
-subGLOBALRES=$(SOLARDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
) > $(NULLDEV)
.ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-r -p \
$(foreach,i,$(alllangiso) -lg$i \
......@@ -65,24 +49,15 @@ $(RSC_MULTI$(TNR)) : \
-ft=$@ \
$(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
) > $(NULLDEV)
.ENDIF # "$(common_build_reslib)"!=""
$(RESLIB$(TNR)TARGETN): \
$(RESLIB$(TNR)SRSFILES) \
$(RESLIB$(TNR)BMPS)
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
.IF "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI$(TNR))
.ELSE # "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI$(TNR))
.ENDIF # "$(common_build_reslib)"!=""
.ELSE # "$(GUI)"=="UNX"
.IF "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI$(TNR))
.ELSE # "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI$(TNR))
.ENDIF # "$(common_build_reslib)"!=""
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(RESLIB$(TNR)TARGETN)"!=""
......
solenv/inc/tg_zip.mk
Dosyayı görüntüle @ 5f03eb4b
......@@ -46,19 +46,11 @@ CALLXSLTPROC:=$(XSLTPROC)
.ENDIF
ZIP$(TNR)EXT*=.zip
.IF "$(common_build_zip)"!=""
.IF "$(ZIP$(TNR)LIST:s/LANGDIR//)" == "$(ZIP$(TNR)LIST)"
ZIP$(TNR)TARGETN=$(COMMONBIN)/$(ZIP$(TNR)TARGET)$(ZIP$(TNR)EXT)
.ELSE
ZIP$(TNR)TARGETN=$(foreach,i,$(zip$(TNR)alllangiso) $(COMMONBIN)/$(ZIP$(TNR)TARGET)_$i$(ZIP$(TNR)EXT) )
.ENDIF
.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP$(TNR)LIST:s/LANGDIR//)" == "$(ZIP$(TNR)LIST)"
ZIP$(TNR)TARGETN=$(BIN)/$(ZIP$(TNR)TARGET)$(ZIP$(TNR)EXT)
.ELSE
ZIP$(TNR)TARGETN=$(foreach,i,$(zip$(TNR)alllangiso) $(BIN)/$(ZIP$(TNR)TARGET)_$i$(ZIP$(TNR)EXT) )
.ENDIF
.ENDIF # "$(common_build_zip)"!=""
ZIP$(TNR)DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP$(TNR)TARGETN:s/$(ZIP$(TNR)EXT)/.dpzz/)))
ZIPDEPFILES+=$(ZIP$(TNR)DEPFILE)
......@@ -82,29 +74,16 @@ ZIP$(TNR)TMP:=$(mktmp iii)
$(MISC)/$(TARGET).$(PWD:f).$(ZIP$(TNR)TARGET).dpzz : $(ZIP$(TNR)TARGETN)
.IF "$(common_build_zip)"!=""
ZIP$(TNR)HELPVAR=$(COMMONBIN)/$(ZIP$(TNR)TARGET)
.ELSE # "$(common_build_zip)"!=""
ZIP$(TNR)HELPVAR=$(BIN)/$(ZIP$(TNR)TARGET)
.ENDIF # "$(common_build_zip)"!=""
$(ZIP$(TNR)DEPFILE) :
@echo # > $(MISC)/$(@:f)
.IF "$(common_build_zip)"!=""
.IF "$(ZIP$(TNR)DIR)" != ""
$(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP$(TNR)DIR)
$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
.ELSE # "$(ZIP$(TNR)DIR)" != ""
$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
.ENDIF # "$(ZIP$(TNR)DIR)" != ""
.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP$(TNR)DIR)" != ""
$(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP$(TNR)DIR)
$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
.ELSE # "$(ZIP$(TNR)DIR)" != ""
$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
.ENDIF # "$(ZIP$(TNR)DIR)" != ""
.ENDIF # "$(common_build_zip)"!=""
@echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
......@@ -113,28 +92,6 @@ $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS)
@@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
.IF "$(common_build_zip)"!=""
.IF "$(ZIP$(TNR)DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
$(COMMAND_ECHO)$(IFEXIST) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \
$(FI)
$(COMMAND_ECHO)$(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $@.$(INPATH)
$(COMMAND_ECHO)$(RM) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
.ELSE # "$(ZIP$(TNR)DIR)" != ""
@@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
$(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP$(TNR)FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
$(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
$(FI)
@@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
@-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
.ENDIF # "$(ZIP$(TNR)DIR)" != ""
@@-$(RM) $@
@$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
# @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used...
.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP$(TNR)DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
......@@ -154,7 +111,6 @@ $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS)
$(FI)
.ENDIF
.ENDIF # "$(ZIP$(TNR)DIR)" != ""
.ENDIF # "$(common_build_zip)"!=""
.ENDIF
# unroll end
......
sysui/desktop/solaris/makefile.mk
Dosyayı görüntüle @ 5f03eb4b
......@@ -95,17 +95,6 @@ $(MISC)/{$(PRODUCTLIST)}/postremove : $$(@:f)
@$(MKDIRHIER) $(@:d)
@cat $(@:f) | tr -d "\015" > $@
# --- openoffice.xml---------------------------
.IF "$(common_build)"=="TRUE"
# Copy the openoffice.org.xml file to $(MISC)
#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) : $(COMMONMISC)/$$(@:b)/openoffice.org.xml
$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/openoffice.org.xml) : $(COMMONMISC)/$$(@:b)/openoffice.org.xml
$(MKDIRHIER) $(@:d)
echo hier hier $@
cat $< | tr -d "\015" > $@
.ENDIF # "$(COMMON_BUILD)"==""
# --- prototype ---------------------------------------------------
# Copy the prototype file to $(MISC)
......
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