[Libreoffice-commits] .: 7 commits - bridges/source cli_ure/source configure.in cppuhelper/test cppu/source cppu/util desktop/test instsetoo_native/inc_openoffice io/source io/test migrationanalysis/util odk/source reportbuilder/template salhelper/source salhelper/test sal/test sal/util sdext/source set_soenv.in smoketest/com solenv/bin solenv/inc stoc/test store/util sysui/desktop testtools/source ucbhelper/workben ucb/source xmlhelp/source xmlhelp/util xmlsecurity/tools
Tor Lillqvist
tml at kemper.freedesktop.org
Sat Dec 10 16:58:26 PST 2011
bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk | 1
bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk | 1
bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk | 1
bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk | 1
cli_ure/source/native/makefile.mk | 1
cli_ure/source/uno_bridge/makefile.mk | 1
configure.in | 3
cppu/source/AffineBridge/makefile.mk | 1
cppu/source/LogBridge/makefile.mk | 1
cppu/source/UnsafeBridge/makefile.mk | 1
cppu/source/helper/purpenv/makefile.mk | 1
cppu/util/extra.mk | 1
cppu/util/makefile.mk | 1
cppu/util/makefile.pmk | 1
cppuhelper/test/bootstrap/makefile.mk | 1
cppuhelper/test/loader/makefile.mk | 1
desktop/test/deployment/locationtest/makefile.mk | 2
desktop/test/deployment/update/updateinfocreation/build/makefile.mk | 2
instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk | 1
io/source/acceptor/makefile.mk | 1
io/source/connector/makefile.mk | 1
io/source/stm/makefile.mk | 1
io/test/stm/makefile.mk | 1
migrationanalysis/util/makefile.mk | 2
odk/source/unowinreg/win/makefile.mk | 1
reportbuilder/template/makefile.mk | 1
sal/test/unloading/makefile.mk | 1
sal/util/makefile.mk | 1
salhelper/source/makefile.mk | 1
salhelper/test/Symbols/makefile.mk | 1
salhelper/test/dynamicloader/makefile.mk | 1
sdext/source/presenter/makefile.mk | 1
set_soenv.in | 20
smoketest/com/sun/star/comp/smoketest/makefile.mk | 2
solenv/bin/deliver.pl | 68 -
solenv/inc/_tg_rslb.mk | 250 -----
solenv/inc/_tg_zip.mk | 440 ----------
solenv/inc/extension_pre.mk | 1
solenv/inc/pstrules.mk | 4
solenv/inc/settings.mk | 41
solenv/inc/startup/startup.mk | 2
solenv/inc/target.mk | 45 -
solenv/inc/tg_rslb.mk | 25
solenv/inc/tg_zip.mk | 44 -
stoc/test/excomp/makefile.mk | 1
stoc/test/javavm/jvm_interaction/makefile.mk | 1
stoc/test/javavm/makefile.mk | 1
stoc/test/makefile.mk | 1
stoc/test/security/makefile.mk | 1
store/util/makefile.mk | 1
sysui/desktop/solaris/makefile.mk | 11
testtools/source/bridgetest/cli/makefile.mk | 1
ucb/source/cacher/makefile.mk | 1
ucb/source/core/makefile.mk | 1
ucb/source/ucp/cmis/makefile.mk | 1
ucb/source/ucp/expand/makefile.mk | 1
ucb/source/ucp/file/makefile.mk | 1
ucb/source/ucp/ftp/makefile.mk | 1
ucb/source/ucp/gio/makefile.mk | 1
ucb/source/ucp/gvfs/makefile.mk | 1
ucb/source/ucp/hierarchy/makefile.mk | 1
ucb/source/ucp/package/makefile.mk | 1
ucb/source/ucp/tdoc/makefile.mk | 1
ucb/source/ucp/webdav/makefile.mk | 1
ucbhelper/workben/myucp/makefile.mk | 1
xmlhelp/source/cxxhelp/provider/makefile.mk | 1
xmlhelp/source/treeview/makefile.mk | 1
xmlhelp/util/makefile.mk | 1
xmlsecurity/tools/demo/makefile.mk | 1
xmlsecurity/tools/standalone/csfit/makefile.mk | 1
xmlsecurity/tools/standalone/mscsfit/makefile.mk | 1
71 files changed, 11 insertions(+), 1005 deletions(-)
New commits:
commit 5f03eb4bc698d0915e7f75605347780ab8d2b4de
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Sun Dec 11 02:56:22 2011 +0200
The common_build stuff is surely obsolete
diff --git a/desktop/test/deployment/locationtest/makefile.mk b/desktop/test/deployment/locationtest/makefile.mk
index 24be56c..9ec3cd2 100644
--- a/desktop/test/deployment/locationtest/makefile.mk
+++ b/desktop/test/deployment/locationtest/makefile.mk
@@ -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
diff --git a/desktop/test/deployment/update/updateinfocreation/build/makefile.mk b/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
index b0479c9..4864de6 100644
--- a/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
+++ b/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
@@ -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
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
index b019967..2b7e1be 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
@@ -32,7 +32,6 @@ TARGET=win_ulffiles
# --- Settings -----------------------------------------------------
-common_build:=
.INCLUDE : settings.mk
# ------------------------------------------------------------------
diff --git a/migrationanalysis/util/makefile.mk b/migrationanalysis/util/makefile.mk
index 550af0a..7585a77 100644
--- a/migrationanalysis/util/makefile.mk
+++ b/migrationanalysis/util/makefile.mk
@@ -30,8 +30,6 @@ PRJ=..
PRJNAME=migrationanalysis
TARGET=paw
-no_common_build_zip=TRUE
-
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
diff --git a/reportbuilder/template/makefile.mk b/reportbuilder/template/makefile.mk
index 4c9782a..cf38d10 100644
--- a/reportbuilder/template/makefile.mk
+++ b/reportbuilder/template/makefile.mk
@@ -30,7 +30,6 @@ PRJNAME=reportbuilder
TARGET=rpt_templates
# ???
-no_common_build_zip=true
EXTENSION_VERSION_BASE=1.0.0
.IF "$(DBG_LEVEL)" == "0"
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index fd95093..6d9e5bb 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -52,7 +52,6 @@ PACKAGE=com.sun.PresenterScreen-$(PLATFORMID)
.INCLUDE : $(PRJ)$/util$/makefile.pmk
DLLPRE=
-common_build_zip=
# --- Files -------------------------------------
diff --git a/set_soenv.in b/set_soenv.in
index f1aa200..5042d88 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -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") {
diff --git a/smoketest/com/sun/star/comp/smoketest/makefile.mk b/smoketest/com/sun/star/comp/smoketest/makefile.mk
index 937f377..88e5370 100755
--- a/smoketest/com/sun/star/comp/smoketest/makefile.mk
+++ b/smoketest/com/sun/star/comp/smoketest/makefile.mk
@@ -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)" != ""
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 3211e01..58664e3 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -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 ) {
diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
index 1edebb8..9c583fc 100644
--- a/solenv/inc/_tg_rslb.mk
+++ b/solenv/inc/_tg_rslb.mk
@@ -7,22 +7,6 @@ $(RSC_MULTI1) : \
$(RESLIB1TARGETN) \
$(RESLIB1BMPS)
@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))/$(RESLIB1NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
- -lip={$j} ) \
- -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
- -subMODULE=$(SOLARDEFIMG) \
- -subGLOBALRES=$(SOLARDEFIMG)/res \
- -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
- -ft=$@ \
- $(RSC1HEADER) $(RESLIB1SRSFILES) \
- ) > $(NULLDEV)
-.ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-r -p \
$(foreach,i,$(alllangiso) -lg$i \
@@ -37,24 +21,15 @@ $(RSC_MULTI1) : \
-ft=$@ \
$(RSC1HEADER) $(RESLIB1SRSFILES) \
) > $(NULLDEV)
-.ENDIF # "$(common_build_reslib)"!=""
$(RESLIB1TARGETN): \
$(RESLIB1SRSFILES) \
$(RESLIB1BMPS)
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI1)
-.ELSE # "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI1)
-.ENDIF # "$(common_build_reslib)"!=""
.ELSE # "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI1)
-.ELSE # "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI1)
-.ENDIF # "$(common_build_reslib)"!=""
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(RESLIB1TARGETN)"!=""
@@ -68,22 +43,6 @@ $(RSC_MULTI2) : \
$(RESLIB2TARGETN) \
$(RESLIB2BMPS)
@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))/$(RESLIB2NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
- -lip={$j} ) \
- -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
- -subMODULE=$(SOLARDEFIMG) \
- -subGLOBALRES=$(SOLARDEFIMG)/res \
- -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
- -ft=$@ \
- $(RSC2HEADER) $(RESLIB2SRSFILES) \
- ) > $(NULLDEV)
-.ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-r -p \
$(foreach,i,$(alllangiso) -lg$i \
@@ -98,24 +57,15 @@ $(RSC_MULTI2) : \
-ft=$@ \
$(RSC2HEADER) $(RESLIB2SRSFILES) \
) > $(NULLDEV)
-.ENDIF # "$(common_build_reslib)"!=""
$(RESLIB2TARGETN): \
$(RESLIB2SRSFILES) \
$(RESLIB2BMPS)
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI2)
-.ELSE # "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI2)
-.ENDIF # "$(common_build_reslib)"!=""
.ELSE # "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI2)
-.ELSE # "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI2)
-.ENDIF # "$(common_build_reslib)"!=""
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(RESLIB2TARGETN)"!=""
@@ -129,22 +79,6 @@ $(RSC_MULTI3) : \
$(RESLIB3TARGETN) \
$(RESLIB3BMPS)
@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))/$(RESLIB3NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
- -lip={$j} ) \
- -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
- -subMODULE=$(SOLARDEFIMG) \
- -subGLOBALRES=$(SOLARDEFIMG)/res \
- -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
- -ft=$@ \
- $(RSC3HEADER) $(RESLIB3SRSFILES) \
- ) > $(NULLDEV)
-.ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-r -p \
$(foreach,i,$(alllangiso) -lg$i \
@@ -159,24 +93,15 @@ $(RSC_MULTI3) : \
-ft=$@ \
$(RSC3HEADER) $(RESLIB3SRSFILES) \
) > $(NULLDEV)
-.ENDIF # "$(common_build_reslib)"!=""
$(RESLIB3TARGETN): \
$(RESLIB3SRSFILES) \
$(RESLIB3BMPS)
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI3)
-.ELSE # "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI3)
-.ENDIF # "$(common_build_reslib)"!=""
.ELSE # "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI3)
-.ELSE # "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI3)
-.ENDIF # "$(common_build_reslib)"!=""
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(RESLIB3TARGETN)"!=""
@@ -190,22 +115,6 @@ $(RSC_MULTI4) : \
$(RESLIB4TARGETN) \
$(RESLIB4BMPS)
@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))/$(RESLIB4NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
- -lip={$j} ) \
- -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
- -subMODULE=$(SOLARDEFIMG) \
- -subGLOBALRES=$(SOLARDEFIMG)/res \
- -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
- -ft=$@ \
- $(RSC4HEADER) $(RESLIB4SRSFILES) \
- ) > $(NULLDEV)
-.ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-r -p \
$(foreach,i,$(alllangiso) -lg$i \
@@ -220,24 +129,15 @@ $(RSC_MULTI4) : \
-ft=$@ \
$(RSC4HEADER) $(RESLIB4SRSFILES) \
) > $(NULLDEV)
-.ENDIF # "$(common_build_reslib)"!=""
$(RESLIB4TARGETN): \
$(RESLIB4SRSFILES) \
$(RESLIB4BMPS)
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI4)
-.ELSE # "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI4)
-.ENDIF # "$(common_build_reslib)"!=""
.ELSE # "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI4)
-.ELSE # "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI4)
-.ENDIF # "$(common_build_reslib)"!=""
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(RESLIB4TARGETN)"!=""
@@ -251,22 +151,6 @@ $(RSC_MULTI5) : \
$(RESLIB5TARGETN) \
$(RESLIB5BMPS)
@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))/$(RESLIB5NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
- -lip={$j} ) \
- -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
- -subMODULE=$(SOLARDEFIMG) \
- -subGLOBALRES=$(SOLARDEFIMG)/res \
- -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
- -ft=$@ \
- $(RSC5HEADER) $(RESLIB5SRSFILES) \
- ) > $(NULLDEV)
-.ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-r -p \
$(foreach,i,$(alllangiso) -lg$i \
@@ -281,24 +165,15 @@ $(RSC_MULTI5) : \
-ft=$@ \
$(RSC5HEADER) $(RESLIB5SRSFILES) \
) > $(NULLDEV)
-.ENDIF # "$(common_build_reslib)"!=""
$(RESLIB5TARGETN): \
$(RESLIB5SRSFILES) \
$(RESLIB5BMPS)
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI5)
-.ELSE # "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI5)
-.ENDIF # "$(common_build_reslib)"!=""
.ELSE # "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI5)
-.ELSE # "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI5)
-.ENDIF # "$(common_build_reslib)"!=""
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(RESLIB5TARGETN)"!=""
@@ -312,22 +187,6 @@ $(RSC_MULTI6) : \
$(RESLIB6TARGETN) \
$(RESLIB6BMPS)
@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))/$(RESLIB6NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
- -lip={$j} ) \
- -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
- -subMODULE=$(SOLARDEFIMG) \
- -subGLOBALRES=$(SOLARDEFIMG)/res \
- -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
- -ft=$@ \
- $(RSC6HEADER) $(RESLIB6SRSFILES) \
- ) > $(NULLDEV)
-.ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-r -p \
$(foreach,i,$(alllangiso) -lg$i \
@@ -342,24 +201,15 @@ $(RSC_MULTI6) : \
-ft=$@ \
$(RSC6HEADER) $(RESLIB6SRSFILES) \
) > $(NULLDEV)
-.ENDIF # "$(common_build_reslib)"!=""
$(RESLIB6TARGETN): \
$(RESLIB6SRSFILES) \
$(RESLIB6BMPS)
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI6)
-.ELSE # "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI6)
-.ENDIF # "$(common_build_reslib)"!=""
.ELSE # "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI6)
-.ELSE # "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI6)
-.ENDIF # "$(common_build_reslib)"!=""
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(RESLIB6TARGETN)"!=""
@@ -373,22 +223,6 @@ $(RSC_MULTI7) : \
$(RESLIB7TARGETN) \
$(RESLIB7BMPS)
@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))/$(RESLIB7NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
- -lip={$j} ) \
- -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
- -subMODULE=$(SOLARDEFIMG) \
- -subGLOBALRES=$(SOLARDEFIMG)/res \
- -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
- -ft=$@ \
- $(RSC7HEADER) $(RESLIB7SRSFILES) \
- ) > $(NULLDEV)
-.ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-r -p \
$(foreach,i,$(alllangiso) -lg$i \
@@ -403,24 +237,15 @@ $(RSC_MULTI7) : \
-ft=$@ \
$(RSC7HEADER) $(RESLIB7SRSFILES) \
) > $(NULLDEV)
-.ENDIF # "$(common_build_reslib)"!=""
$(RESLIB7TARGETN): \
$(RESLIB7SRSFILES) \
$(RESLIB7BMPS)
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI7)
-.ELSE # "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI7)
-.ENDIF # "$(common_build_reslib)"!=""
.ELSE # "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI7)
-.ELSE # "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI7)
-.ENDIF # "$(common_build_reslib)"!=""
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(RESLIB7TARGETN)"!=""
@@ -434,22 +259,6 @@ $(RSC_MULTI8) : \
$(RESLIB8TARGETN) \
$(RESLIB8BMPS)
@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))/$(RESLIB8NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
- -lip={$j} ) \
- -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
- -subMODULE=$(SOLARDEFIMG) \
- -subGLOBALRES=$(SOLARDEFIMG)/res \
- -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
- -ft=$@ \
- $(RSC8HEADER) $(RESLIB8SRSFILES) \
- ) > $(NULLDEV)
-.ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-r -p \
$(foreach,i,$(alllangiso) -lg$i \
@@ -464,24 +273,15 @@ $(RSC_MULTI8) : \
-ft=$@ \
$(RSC8HEADER) $(RESLIB8SRSFILES) \
) > $(NULLDEV)
-.ENDIF # "$(common_build_reslib)"!=""
$(RESLIB8TARGETN): \
$(RESLIB8SRSFILES) \
$(RESLIB8BMPS)
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI8)
-.ELSE # "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI8)
-.ENDIF # "$(common_build_reslib)"!=""
.ELSE # "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI8)
-.ELSE # "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI8)
-.ENDIF # "$(common_build_reslib)"!=""
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(RESLIB8TARGETN)"!=""
@@ -495,22 +295,6 @@ $(RSC_MULTI9) : \
$(RESLIB9TARGETN) \
$(RESLIB9BMPS)
@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))/$(RESLIB9NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
- -lip={$j} ) \
- -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
- -subMODULE=$(SOLARDEFIMG) \
- -subGLOBALRES=$(SOLARDEFIMG)/res \
- -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
- -ft=$@ \
- $(RSC9HEADER) $(RESLIB9SRSFILES) \
- ) > $(NULLDEV)
-.ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-r -p \
$(foreach,i,$(alllangiso) -lg$i \
@@ -525,24 +309,15 @@ $(RSC_MULTI9) : \
-ft=$@ \
$(RSC9HEADER) $(RESLIB9SRSFILES) \
) > $(NULLDEV)
-.ENDIF # "$(common_build_reslib)"!=""
$(RESLIB9TARGETN): \
$(RESLIB9SRSFILES) \
$(RESLIB9BMPS)
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI9)
-.ELSE # "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI9)
-.ENDIF # "$(common_build_reslib)"!=""
.ELSE # "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI9)
-.ELSE # "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI9)
-.ENDIF # "$(common_build_reslib)"!=""
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(RESLIB9TARGETN)"!=""
@@ -556,22 +331,6 @@ $(RSC_MULTI10) : \
$(RESLIB10TARGETN) \
$(RESLIB10BMPS)
@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))/$(RESLIB10NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
- -lip={$j} ) \
- -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
- -subMODULE=$(SOLARDEFIMG) \
- -subGLOBALRES=$(SOLARDEFIMG)/res \
- -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
- -ft=$@ \
- $(RSC10HEADER) $(RESLIB10SRSFILES) \
- ) > $(NULLDEV)
-.ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-r -p \
$(foreach,i,$(alllangiso) -lg$i \
@@ -586,24 +345,15 @@ $(RSC_MULTI10) : \
-ft=$@ \
$(RSC10HEADER) $(RESLIB10SRSFILES) \
) > $(NULLDEV)
-.ENDIF # "$(common_build_reslib)"!=""
$(RESLIB10TARGETN): \
$(RESLIB10SRSFILES) \
$(RESLIB10BMPS)
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI10)
-.ELSE # "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI10)
-.ENDIF # "$(common_build_reslib)"!=""
.ELSE # "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
- @@-$(RM) $(RSC_MULTI10)
-.ELSE # "$(common_build_reslib)"!=""
@@-$(RM) $(RSC_MULTI10)
-.ENDIF # "$(common_build_reslib)"!=""
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(RESLIB10TARGETN)"!=""
diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index c60480b..deb2aa0 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -18,19 +18,11 @@ CALLXSLTPROC:=$(XSLTPROC)
.ENDIF
ZIP1EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP1LIST:s/LANGDIR//)" == "$(ZIP1LIST)"
-ZIP1TARGETN=$(COMMONBIN)/$(ZIP1TARGET)$(ZIP1EXT)
-.ELSE
-ZIP1TARGETN=$(foreach,i,$(zip1alllangiso) $(COMMONBIN)/$(ZIP1TARGET)_$i$(ZIP1EXT) )
-.ENDIF
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP1LIST:s/LANGDIR//)" == "$(ZIP1LIST)"
ZIP1TARGETN=$(BIN)/$(ZIP1TARGET)$(ZIP1EXT)
.ELSE
ZIP1TARGETN=$(foreach,i,$(zip1alllangiso) $(BIN)/$(ZIP1TARGET)_$i$(ZIP1EXT) )
.ENDIF
-.ENDIF # "$(common_build_zip)"!=""
ZIP1DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP1TARGETN:s/$(ZIP1EXT)/.dpzz/)))
ZIPDEPFILES+=$(ZIP1DEPFILE)
@@ -54,29 +46,16 @@ ZIP1TMP:=$(mktmp iii)
$(MISC)/$(TARGET).$(PWD:f).$(ZIP1TARGET).dpzz : $(ZIP1TARGETN)
-.IF "$(common_build_zip)"!=""
-ZIP1HELPVAR=$(COMMONBIN)/$(ZIP1TARGET)
-.ELSE # "$(common_build_zip)"!=""
ZIP1HELPVAR=$(BIN)/$(ZIP1TARGET)
-.ENDIF # "$(common_build_zip)"!=""
$(ZIP1DEPFILE) :
@echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP1DIR)" != ""
- $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP1DIR)
- $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE # "$(ZIP1DIR)" != ""
- $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP1FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF # "$(ZIP1DIR)" != ""
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP1DIR)" != ""
$(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP1DIR)
$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
.ELSE # "$(ZIP1DIR)" != ""
$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP1FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
.ENDIF # "$(ZIP1DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
@echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
@@ -85,28 +64,6 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
@@$(!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 "$(ZIP1DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
- $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
- $(COMMAND_ECHO)$(IFEXIST) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \
- $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
- $(FI)
- $(COMMAND_ECHO)$(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $@.$(INPATH)
- $(COMMAND_ECHO)$(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
-.ELSE # "$(ZIP1DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
- $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@: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 # "$(ZIP1DIR)" != ""
- @@-$(RM) $@
- @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-# @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used...
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP1DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
@@ -126,7 +83,6 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
$(FI)
.ENDIF
.ENDIF # "$(ZIP1DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
.ENDIF
# unroll begin
@@ -149,19 +105,11 @@ CALLXSLTPROC:=$(XSLTPROC)
.ENDIF
ZIP2EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP2LIST:s/LANGDIR//)" == "$(ZIP2LIST)"
-ZIP2TARGETN=$(COMMONBIN)/$(ZIP2TARGET)$(ZIP2EXT)
-.ELSE
-ZIP2TARGETN=$(foreach,i,$(zip2alllangiso) $(COMMONBIN)/$(ZIP2TARGET)_$i$(ZIP2EXT) )
-.ENDIF
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP2LIST:s/LANGDIR//)" == "$(ZIP2LIST)"
ZIP2TARGETN=$(BIN)/$(ZIP2TARGET)$(ZIP2EXT)
.ELSE
ZIP2TARGETN=$(foreach,i,$(zip2alllangiso) $(BIN)/$(ZIP2TARGET)_$i$(ZIP2EXT) )
.ENDIF
-.ENDIF # "$(common_build_zip)"!=""
ZIP2DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP2TARGETN:s/$(ZIP2EXT)/.dpzz/)))
ZIPDEPFILES+=$(ZIP2DEPFILE)
@@ -185,29 +133,16 @@ ZIP2TMP:=$(mktmp iii)
$(MISC)/$(TARGET).$(PWD:f).$(ZIP2TARGET).dpzz : $(ZIP2TARGETN)
-.IF "$(common_build_zip)"!=""
-ZIP2HELPVAR=$(COMMONBIN)/$(ZIP2TARGET)
-.ELSE # "$(common_build_zip)"!=""
ZIP2HELPVAR=$(BIN)/$(ZIP2TARGET)
-.ENDIF # "$(common_build_zip)"!=""
$(ZIP2DEPFILE) :
@echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP2DIR)" != ""
- $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP2DIR)
- $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE # "$(ZIP2DIR)" != ""
- $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP2FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF # "$(ZIP2DIR)" != ""
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP2DIR)" != ""
$(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP2DIR)
$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
.ELSE # "$(ZIP2DIR)" != ""
$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP2FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
.ENDIF # "$(ZIP2DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
@echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
@@ -216,28 +151,6 @@ $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
@@$(!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 "$(ZIP2DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
- $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
- $(COMMAND_ECHO)$(IFEXIST) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(THEN) \
- $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \
- $(FI)
- $(COMMAND_ECHO)$(COPY) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $@.$(INPATH)
- $(COMMAND_ECHO)$(RM) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
-.ELSE # "$(ZIP2DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
- $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP2FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@: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 # "$(ZIP2DIR)" != ""
- @@-$(RM) $@
- @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-# @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used...
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP2DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
@@ -257,7 +170,6 @@ $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
$(FI)
.ENDIF
.ENDIF # "$(ZIP2DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
.ENDIF
# unroll begin
@@ -280,19 +192,11 @@ CALLXSLTPROC:=$(XSLTPROC)
.ENDIF
ZIP3EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP3LIST:s/LANGDIR//)" == "$(ZIP3LIST)"
-ZIP3TARGETN=$(COMMONBIN)/$(ZIP3TARGET)$(ZIP3EXT)
-.ELSE
-ZIP3TARGETN=$(foreach,i,$(zip3alllangiso) $(COMMONBIN)/$(ZIP3TARGET)_$i$(ZIP3EXT) )
-.ENDIF
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP3LIST:s/LANGDIR//)" == "$(ZIP3LIST)"
ZIP3TARGETN=$(BIN)/$(ZIP3TARGET)$(ZIP3EXT)
.ELSE
ZIP3TARGETN=$(foreach,i,$(zip3alllangiso) $(BIN)/$(ZIP3TARGET)_$i$(ZIP3EXT) )
.ENDIF
-.ENDIF # "$(common_build_zip)"!=""
ZIP3DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP3TARGETN:s/$(ZIP3EXT)/.dpzz/)))
ZIPDEPFILES+=$(ZIP3DEPFILE)
@@ -316,29 +220,16 @@ ZIP3TMP:=$(mktmp iii)
$(MISC)/$(TARGET).$(PWD:f).$(ZIP3TARGET).dpzz : $(ZIP3TARGETN)
-.IF "$(common_build_zip)"!=""
-ZIP3HELPVAR=$(COMMONBIN)/$(ZIP3TARGET)
-.ELSE # "$(common_build_zip)"!=""
ZIP3HELPVAR=$(BIN)/$(ZIP3TARGET)
-.ENDIF # "$(common_build_zip)"!=""
$(ZIP3DEPFILE) :
@echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP3DIR)" != ""
- $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP3DIR)
- $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE # "$(ZIP3DIR)" != ""
- $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP3FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF # "$(ZIP3DIR)" != ""
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP3DIR)" != ""
$(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP3DIR)
$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
.ELSE # "$(ZIP3DIR)" != ""
$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP3FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
.ENDIF # "$(ZIP3DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
@echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
@@ -347,28 +238,6 @@ $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
@@$(!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 "$(ZIP3DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
- $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
- $(COMMAND_ECHO)$(IFEXIST) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(THEN) \
- $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \
- $(FI)
- $(COMMAND_ECHO)$(COPY) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $@.$(INPATH)
- $(COMMAND_ECHO)$(RM) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
-.ELSE # "$(ZIP3DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
- $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP3FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@: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 # "$(ZIP3DIR)" != ""
- @@-$(RM) $@
- @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-# @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used...
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP3DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
@@ -388,7 +257,6 @@ $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
$(FI)
.ENDIF
.ENDIF # "$(ZIP3DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
.ENDIF
# unroll begin
@@ -411,19 +279,11 @@ CALLXSLTPROC:=$(XSLTPROC)
.ENDIF
ZIP4EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP4LIST:s/LANGDIR//)" == "$(ZIP4LIST)"
-ZIP4TARGETN=$(COMMONBIN)/$(ZIP4TARGET)$(ZIP4EXT)
-.ELSE
-ZIP4TARGETN=$(foreach,i,$(zip4alllangiso) $(COMMONBIN)/$(ZIP4TARGET)_$i$(ZIP4EXT) )
-.ENDIF
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP4LIST:s/LANGDIR//)" == "$(ZIP4LIST)"
ZIP4TARGETN=$(BIN)/$(ZIP4TARGET)$(ZIP4EXT)
.ELSE
ZIP4TARGETN=$(foreach,i,$(zip4alllangiso) $(BIN)/$(ZIP4TARGET)_$i$(ZIP4EXT) )
.ENDIF
-.ENDIF # "$(common_build_zip)"!=""
ZIP4DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP4TARGETN:s/$(ZIP4EXT)/.dpzz/)))
ZIPDEPFILES+=$(ZIP4DEPFILE)
@@ -447,29 +307,16 @@ ZIP4TMP:=$(mktmp iii)
$(MISC)/$(TARGET).$(PWD:f).$(ZIP4TARGET).dpzz : $(ZIP4TARGETN)
-.IF "$(common_build_zip)"!=""
-ZIP4HELPVAR=$(COMMONBIN)/$(ZIP4TARGET)
-.ELSE # "$(common_build_zip)"!=""
ZIP4HELPVAR=$(BIN)/$(ZIP4TARGET)
-.ENDIF # "$(common_build_zip)"!=""
$(ZIP4DEPFILE) :
@echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP4DIR)" != ""
- $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP4DIR)
- $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE # "$(ZIP4DIR)" != ""
- $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP4FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF # "$(ZIP4DIR)" != ""
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP4DIR)" != ""
$(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP4DIR)
$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
.ELSE # "$(ZIP4DIR)" != ""
$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP4FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
.ENDIF # "$(ZIP4DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
@echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
@@ -478,28 +325,6 @@ $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
@@$(!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 "$(ZIP4DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
- $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
- $(COMMAND_ECHO)$(IFEXIST) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(THEN) \
- $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \
- $(FI)
- $(COMMAND_ECHO)$(COPY) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $@.$(INPATH)
- $(COMMAND_ECHO)$(RM) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
-.ELSE # "$(ZIP4DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
- $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP4FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@: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 # "$(ZIP4DIR)" != ""
- @@-$(RM) $@
- @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-# @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used...
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP4DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
@@ -519,7 +344,6 @@ $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
$(FI)
.ENDIF
.ENDIF # "$(ZIP4DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
.ENDIF
# unroll begin
@@ -542,19 +366,11 @@ CALLXSLTPROC:=$(XSLTPROC)
.ENDIF
ZIP5EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP5LIST:s/LANGDIR//)" == "$(ZIP5LIST)"
-ZIP5TARGETN=$(COMMONBIN)/$(ZIP5TARGET)$(ZIP5EXT)
-.ELSE
-ZIP5TARGETN=$(foreach,i,$(zip5alllangiso) $(COMMONBIN)/$(ZIP5TARGET)_$i$(ZIP5EXT) )
-.ENDIF
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP5LIST:s/LANGDIR//)" == "$(ZIP5LIST)"
ZIP5TARGETN=$(BIN)/$(ZIP5TARGET)$(ZIP5EXT)
.ELSE
ZIP5TARGETN=$(foreach,i,$(zip5alllangiso) $(BIN)/$(ZIP5TARGET)_$i$(ZIP5EXT) )
.ENDIF
-.ENDIF # "$(common_build_zip)"!=""
ZIP5DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP5TARGETN:s/$(ZIP5EXT)/.dpzz/)))
ZIPDEPFILES+=$(ZIP5DEPFILE)
@@ -578,29 +394,16 @@ ZIP5TMP:=$(mktmp iii)
$(MISC)/$(TARGET).$(PWD:f).$(ZIP5TARGET).dpzz : $(ZIP5TARGETN)
-.IF "$(common_build_zip)"!=""
-ZIP5HELPVAR=$(COMMONBIN)/$(ZIP5TARGET)
-.ELSE # "$(common_build_zip)"!=""
ZIP5HELPVAR=$(BIN)/$(ZIP5TARGET)
-.ENDIF # "$(common_build_zip)"!=""
$(ZIP5DEPFILE) :
@echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP5DIR)" != ""
- $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP5DIR)
- $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE # "$(ZIP5DIR)" != ""
- $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP5FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF # "$(ZIP5DIR)" != ""
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP5DIR)" != ""
$(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP5DIR)
$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
.ELSE # "$(ZIP5DIR)" != ""
$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP5FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
.ENDIF # "$(ZIP5DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
@echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
@@ -609,28 +412,6 @@ $(ZIP5TARGETN) : delzip $(ZIP5DEPS)
@@$(!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 "$(ZIP5DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
- $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
- $(COMMAND_ECHO)$(IFEXIST) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(THEN) \
- $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \
- $(FI)
- $(COMMAND_ECHO)$(COPY) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $@.$(INPATH)
- $(COMMAND_ECHO)$(RM) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
-.ELSE # "$(ZIP5DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
- $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP5FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@: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 # "$(ZIP5DIR)" != ""
- @@-$(RM) $@
- @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-# @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used...
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP5DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
@@ -650,7 +431,6 @@ $(ZIP5TARGETN) : delzip $(ZIP5DEPS)
$(FI)
.ENDIF
.ENDIF # "$(ZIP5DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
.ENDIF
# unroll begin
@@ -673,19 +453,11 @@ CALLXSLTPROC:=$(XSLTPROC)
.ENDIF
ZIP6EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP6LIST:s/LANGDIR//)" == "$(ZIP6LIST)"
-ZIP6TARGETN=$(COMMONBIN)/$(ZIP6TARGET)$(ZIP6EXT)
-.ELSE
-ZIP6TARGETN=$(foreach,i,$(zip6alllangiso) $(COMMONBIN)/$(ZIP6TARGET)_$i$(ZIP6EXT) )
-.ENDIF
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP6LIST:s/LANGDIR//)" == "$(ZIP6LIST)"
ZIP6TARGETN=$(BIN)/$(ZIP6TARGET)$(ZIP6EXT)
.ELSE
ZIP6TARGETN=$(foreach,i,$(zip6alllangiso) $(BIN)/$(ZIP6TARGET)_$i$(ZIP6EXT) )
.ENDIF
-.ENDIF # "$(common_build_zip)"!=""
ZIP6DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP6TARGETN:s/$(ZIP6EXT)/.dpzz/)))
ZIPDEPFILES+=$(ZIP6DEPFILE)
@@ -709,29 +481,16 @@ ZIP6TMP:=$(mktmp iii)
$(MISC)/$(TARGET).$(PWD:f).$(ZIP6TARGET).dpzz : $(ZIP6TARGETN)
-.IF "$(common_build_zip)"!=""
-ZIP6HELPVAR=$(COMMONBIN)/$(ZIP6TARGET)
-.ELSE # "$(common_build_zip)"!=""
ZIP6HELPVAR=$(BIN)/$(ZIP6TARGET)
-.ENDIF # "$(common_build_zip)"!=""
$(ZIP6DEPFILE) :
@echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP6DIR)" != ""
- $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP6DIR)
- $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE # "$(ZIP6DIR)" != ""
- $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP6FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF # "$(ZIP6DIR)" != ""
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP6DIR)" != ""
$(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP6DIR)
$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
.ELSE # "$(ZIP6DIR)" != ""
$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP6FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
.ENDIF # "$(ZIP6DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
@echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
@@ -740,28 +499,6 @@ $(ZIP6TARGETN) : delzip $(ZIP6DEPS)
@@$(!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 "$(ZIP6DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
- $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
- $(COMMAND_ECHO)$(IFEXIST) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(THEN) \
- $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \
- $(FI)
- $(COMMAND_ECHO)$(COPY) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $@.$(INPATH)
- $(COMMAND_ECHO)$(RM) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
-.ELSE # "$(ZIP6DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
- $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP6FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@: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 # "$(ZIP6DIR)" != ""
- @@-$(RM) $@
- @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-# @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used...
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP6DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
@@ -781,7 +518,6 @@ $(ZIP6TARGETN) : delzip $(ZIP6DEPS)
$(FI)
.ENDIF
.ENDIF # "$(ZIP6DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
.ENDIF
# unroll begin
@@ -804,19 +540,11 @@ CALLXSLTPROC:=$(XSLTPROC)
.ENDIF
ZIP7EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP7LIST:s/LANGDIR//)" == "$(ZIP7LIST)"
-ZIP7TARGETN=$(COMMONBIN)/$(ZIP7TARGET)$(ZIP7EXT)
-.ELSE
-ZIP7TARGETN=$(foreach,i,$(zip7alllangiso) $(COMMONBIN)/$(ZIP7TARGET)_$i$(ZIP7EXT) )
-.ENDIF
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP7LIST:s/LANGDIR//)" == "$(ZIP7LIST)"
ZIP7TARGETN=$(BIN)/$(ZIP7TARGET)$(ZIP7EXT)
.ELSE
ZIP7TARGETN=$(foreach,i,$(zip7alllangiso) $(BIN)/$(ZIP7TARGET)_$i$(ZIP7EXT) )
.ENDIF
-.ENDIF # "$(common_build_zip)"!=""
ZIP7DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP7TARGETN:s/$(ZIP7EXT)/.dpzz/)))
ZIPDEPFILES+=$(ZIP7DEPFILE)
@@ -840,29 +568,16 @@ ZIP7TMP:=$(mktmp iii)
$(MISC)/$(TARGET).$(PWD:f).$(ZIP7TARGET).dpzz : $(ZIP7TARGETN)
-.IF "$(common_build_zip)"!=""
-ZIP7HELPVAR=$(COMMONBIN)/$(ZIP7TARGET)
-.ELSE # "$(common_build_zip)"!=""
ZIP7HELPVAR=$(BIN)/$(ZIP7TARGET)
-.ENDIF # "$(common_build_zip)"!=""
$(ZIP7DEPFILE) :
@echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP7DIR)" != ""
- $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP7DIR)
- $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE # "$(ZIP7DIR)" != ""
- $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP7FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF # "$(ZIP7DIR)" != ""
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP7DIR)" != ""
$(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP7DIR)
$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
.ELSE # "$(ZIP7DIR)" != ""
$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP7FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
.ENDIF # "$(ZIP7DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
@echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
@@ -871,28 +586,6 @@ $(ZIP7TARGETN) : delzip $(ZIP7DEPS)
@@$(!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 "$(ZIP7DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
- $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
- $(COMMAND_ECHO)$(IFEXIST) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(THEN) \
- $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \
- $(FI)
- $(COMMAND_ECHO)$(COPY) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $@.$(INPATH)
- $(COMMAND_ECHO)$(RM) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
-.ELSE # "$(ZIP7DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
- $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP7FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@: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 # "$(ZIP7DIR)" != ""
- @@-$(RM) $@
- @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-# @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used...
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP7DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
@@ -912,7 +605,6 @@ $(ZIP7TARGETN) : delzip $(ZIP7DEPS)
$(FI)
.ENDIF
.ENDIF # "$(ZIP7DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
.ENDIF
# unroll begin
@@ -935,19 +627,11 @@ CALLXSLTPROC:=$(XSLTPROC)
.ENDIF
ZIP8EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP8LIST:s/LANGDIR//)" == "$(ZIP8LIST)"
-ZIP8TARGETN=$(COMMONBIN)/$(ZIP8TARGET)$(ZIP8EXT)
-.ELSE
-ZIP8TARGETN=$(foreach,i,$(zip8alllangiso) $(COMMONBIN)/$(ZIP8TARGET)_$i$(ZIP8EXT) )
-.ENDIF
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP8LIST:s/LANGDIR//)" == "$(ZIP8LIST)"
ZIP8TARGETN=$(BIN)/$(ZIP8TARGET)$(ZIP8EXT)
.ELSE
ZIP8TARGETN=$(foreach,i,$(zip8alllangiso) $(BIN)/$(ZIP8TARGET)_$i$(ZIP8EXT) )
.ENDIF
-.ENDIF # "$(common_build_zip)"!=""
ZIP8DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP8TARGETN:s/$(ZIP8EXT)/.dpzz/)))
ZIPDEPFILES+=$(ZIP8DEPFILE)
@@ -971,29 +655,16 @@ ZIP8TMP:=$(mktmp iii)
$(MISC)/$(TARGET).$(PWD:f).$(ZIP8TARGET).dpzz : $(ZIP8TARGETN)
-.IF "$(common_build_zip)"!=""
-ZIP8HELPVAR=$(COMMONBIN)/$(ZIP8TARGET)
-.ELSE # "$(common_build_zip)"!=""
ZIP8HELPVAR=$(BIN)/$(ZIP8TARGET)
-.ENDIF # "$(common_build_zip)"!=""
$(ZIP8DEPFILE) :
@echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP8DIR)" != ""
- $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP8DIR)
- $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE # "$(ZIP8DIR)" != ""
- $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP8FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF # "$(ZIP8DIR)" != ""
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP8DIR)" != ""
$(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP8DIR)
$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
.ELSE # "$(ZIP8DIR)" != ""
$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP8FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
.ENDIF # "$(ZIP8DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
@echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
@@ -1002,28 +673,6 @@ $(ZIP8TARGETN) : delzip $(ZIP8DEPS)
@@$(!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 "$(ZIP8DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
- $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
- $(COMMAND_ECHO)$(IFEXIST) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(THEN) \
- $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \
- $(FI)
- $(COMMAND_ECHO)$(COPY) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $@.$(INPATH)
- $(COMMAND_ECHO)$(RM) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
-.ELSE # "$(ZIP8DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
- $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP8FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@: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 # "$(ZIP8DIR)" != ""
- @@-$(RM) $@
- @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-# @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used...
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP8DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
@@ -1043,7 +692,6 @@ $(ZIP8TARGETN) : delzip $(ZIP8DEPS)
$(FI)
.ENDIF
.ENDIF # "$(ZIP8DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
.ENDIF
# unroll begin
@@ -1066,19 +714,11 @@ CALLXSLTPROC:=$(XSLTPROC)
.ENDIF
ZIP9EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP9LIST:s/LANGDIR//)" == "$(ZIP9LIST)"
-ZIP9TARGETN=$(COMMONBIN)/$(ZIP9TARGET)$(ZIP9EXT)
-.ELSE
-ZIP9TARGETN=$(foreach,i,$(zip9alllangiso) $(COMMONBIN)/$(ZIP9TARGET)_$i$(ZIP9EXT) )
-.ENDIF
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP9LIST:s/LANGDIR//)" == "$(ZIP9LIST)"
ZIP9TARGETN=$(BIN)/$(ZIP9TARGET)$(ZIP9EXT)
.ELSE
ZIP9TARGETN=$(foreach,i,$(zip9alllangiso) $(BIN)/$(ZIP9TARGET)_$i$(ZIP9EXT) )
.ENDIF
-.ENDIF # "$(common_build_zip)"!=""
ZIP9DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP9TARGETN:s/$(ZIP9EXT)/.dpzz/)))
ZIPDEPFILES+=$(ZIP9DEPFILE)
@@ -1102,29 +742,16 @@ ZIP9TMP:=$(mktmp iii)
$(MISC)/$(TARGET).$(PWD:f).$(ZIP9TARGET).dpzz : $(ZIP9TARGETN)
-.IF "$(common_build_zip)"!=""
-ZIP9HELPVAR=$(COMMONBIN)/$(ZIP9TARGET)
-.ELSE # "$(common_build_zip)"!=""
ZIP9HELPVAR=$(BIN)/$(ZIP9TARGET)
-.ENDIF # "$(common_build_zip)"!=""
$(ZIP9DEPFILE) :
@echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP9DIR)" != ""
- $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP9DIR)
- $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE # "$(ZIP9DIR)" != ""
- $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP9FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF # "$(ZIP9DIR)" != ""
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP9DIR)" != ""
$(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP9DIR)
$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
.ELSE # "$(ZIP9DIR)" != ""
$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP9FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
.ENDIF # "$(ZIP9DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
@echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
@@ -1133,28 +760,6 @@ $(ZIP9TARGETN) : delzip $(ZIP9DEPS)
@@$(!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 "$(ZIP9DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
- $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
- $(COMMAND_ECHO)$(IFEXIST) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(THEN) \
- $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \
- $(FI)
- $(COMMAND_ECHO)$(COPY) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $@.$(INPATH)
- $(COMMAND_ECHO)$(RM) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
-.ELSE # "$(ZIP9DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
- $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP9FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@: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 # "$(ZIP9DIR)" != ""
- @@-$(RM) $@
- @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-# @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used...
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP9DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
@@ -1174,7 +779,6 @@ $(ZIP9TARGETN) : delzip $(ZIP9DEPS)
$(FI)
.ENDIF
.ENDIF # "$(ZIP9DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
.ENDIF
# unroll begin
@@ -1197,19 +801,11 @@ CALLXSLTPROC:=$(XSLTPROC)
.ENDIF
ZIP10EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP10LIST:s/LANGDIR//)" == "$(ZIP10LIST)"
-ZIP10TARGETN=$(COMMONBIN)/$(ZIP10TARGET)$(ZIP10EXT)
-.ELSE
-ZIP10TARGETN=$(foreach,i,$(zip10alllangiso) $(COMMONBIN)/$(ZIP10TARGET)_$i$(ZIP10EXT) )
-.ENDIF
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP10LIST:s/LANGDIR//)" == "$(ZIP10LIST)"
ZIP10TARGETN=$(BIN)/$(ZIP10TARGET)$(ZIP10EXT)
.ELSE
ZIP10TARGETN=$(foreach,i,$(zip10alllangiso) $(BIN)/$(ZIP10TARGET)_$i$(ZIP10EXT) )
.ENDIF
-.ENDIF # "$(common_build_zip)"!=""
ZIP10DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP10TARGETN:s/$(ZIP10EXT)/.dpzz/)))
ZIPDEPFILES+=$(ZIP10DEPFILE)
@@ -1233,29 +829,16 @@ ZIP10TMP:=$(mktmp iii)
$(MISC)/$(TARGET).$(PWD:f).$(ZIP10TARGET).dpzz : $(ZIP10TARGETN)
-.IF "$(common_build_zip)"!=""
-ZIP10HELPVAR=$(COMMONBIN)/$(ZIP10TARGET)
-.ELSE # "$(common_build_zip)"!=""
ZIP10HELPVAR=$(BIN)/$(ZIP10TARGET)
-.ENDIF # "$(common_build_zip)"!=""
$(ZIP10DEPFILE) :
@echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP10DIR)" != ""
- $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP10DIR)
- $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE # "$(ZIP10DIR)" != ""
- $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP10FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF # "$(ZIP10DIR)" != ""
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP10DIR)" != ""
$(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP10DIR)
$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
.ELSE # "$(ZIP10DIR)" != ""
$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP10FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
.ENDIF # "$(ZIP10DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
@echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
@@ -1264,28 +847,6 @@ $(ZIP10TARGETN) : delzip $(ZIP10DEPS)
@@$(!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 "$(ZIP10DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
- $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
- $(COMMAND_ECHO)$(IFEXIST) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(THEN) \
- $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \
- $(FI)
- $(COMMAND_ECHO)$(COPY) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $@.$(INPATH)
- $(COMMAND_ECHO)$(RM) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
-.ELSE # "$(ZIP10DIR)" != ""
- @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
- $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP10FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@: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 # "$(ZIP10DIR)" != ""
- @@-$(RM) $@
- @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-# @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used...
-.ELSE # "$(common_build_zip)"!=""
.IF "$(ZIP10DIR)" != ""
@@-$(GNUCOPY) -p $@ $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
@@ -1305,6 +866,5 @@ $(ZIP10TARGETN) : delzip $(ZIP10DEPS)
$(FI)
.ENDIF
.ENDIF # "$(ZIP10DIR)" != ""
-.ENDIF # "$(common_build_zip)"!=""
.ENDIF
diff --git a/solenv/inc/extension_pre.mk b/solenv/inc/extension_pre.mk
index 7fd8f5d..056d50e 100644
--- a/solenv/inc/extension_pre.mk
+++ b/solenv/inc/extension_pre.mk
@@ -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)
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index 1669a25..80f7e99 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -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 $@
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index abfcb41..c8adc34 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -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
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 8196091..07a79f2 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -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
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index 0b1659a..9d3ed15 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -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)"!=""
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk
index 4468a21..084fad3 100644
--- a/solenv/inc/tg_zip.mk
+++ b/solenv/inc/tg_zip.mk
@@ -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
diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk
index f74dae1..703ff0a 100755
--- a/sysui/desktop/solaris/makefile.mk
+++ b/sysui/desktop/solaris/makefile.mk
@@ -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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list