mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged in DEV300_m54

Browse Source
This commit is contained in:
sb
2009-08-05 09:18:12 +02:00
parent d6d81df3a1 3b4220fcee
commit 566c82a4b4
22 changed files with 263 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
instsetoo_native/util/makefile.mk
View File

@@ -149,6 +149,8 @@ ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
ure: $(foreach,i,$(alllangiso) ure_$i)
broffice: $(foreach,i,$(alllangiso) broffice_$i)
@@ -195,6 +197,8 @@ $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
@@ -273,6 +277,14 @@ sdkoo_% :
.ENDIF # "$(PKGFORMAT)"!=""
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH) $(VERBOSESWITCH))
.IF "$(PKGFORMAT)"!=""
$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
sdkoodev_%{$(PKGFORMAT:^".")} :
.ELSE # "$(PKGFORMAT)"!=""
sdkoodev_% :
.ENDIF # "$(PKGFORMAT)"!=""
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH) $(VERBOSESWITCH))
.IF "$(PKGFORMAT)"!=""
$(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
ure_%{$(PKGFORMAT:^".")} :

49
instsetoo_native/util/openoffice.lst
View File

@@ -323,6 +323,55 @@ OpenOffice_SDK
}
}
OpenOffice_Dev_SDK
{
Settings
{
downloadname OOo-Dev-SDK_{packageversion}_{os}_install_{languages}
variables
{
PRODUCTNAME OOo-dev
PRODUCTVERSION 3.2
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
BASISROOTNAME OOo-dev
UNIXBASISROOTNAME ooo-dev
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
PACKAGEVERSION 3.2.0
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX ooobasis-dev
UREPACKAGEPREFIX ooodev
SOLSUREPACKAGEPREFIX ooodev
REGISTRYLAYERNAME LayerDev
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
DATABASENAME openofficeorg32devsdk
NO_README_IN_ROOTDIR 1
LICENSENAME LGPL
IGNOREDIRECTORYLAYER 1
NOVERSIONINDIRNAME 0
NOSPACEINDIRECTORYNAME 1
CHANGETARGETDIR 1
DOWNLOADBANNER ooosdkbanner.bmp
DOWNLOADBITMAP ooosdkbitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
}
active 1
compression 5
script sdkoo
include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarcommonpath}/bin.{minor},{solarenvpath}/{os}/MS
}
}
BrOffice
{
Settings

1
instsetoo_native/util/pack.lst
View File

@@ -15,6 +15,7 @@ OpenOffice unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12
OpenOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro en-US openofficedev
#BrOffice_Dev pt-BR brofficedev
OpenOffice_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoo
OpenOffice_Dev_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoodev
#URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure
OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro de ooolanguagepack
OpenOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12 de ooolanguagepack

16
scp2/source/ooo/common_brand.scp
View File

@@ -419,6 +419,22 @@ File gid_Brand_File_Bin_Unopkgexe
End
#endif
#ifdef WNT
File gid_Brand_File_Bin_Rebaseoo
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
Name = "rebaseoo.exe";
End
File gid_Brand_File_Bin_Rebasegui
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
Name = "rebasegui.exe";
End
#endif
#if defined UNX && !defined MACOSX
File gid_Brand_File_Script_Unopkg
BIN_FILE_BODY;

11
scp2/source/ooo/file_library_ooo.scp
View File

@@ -799,6 +799,17 @@ End
#endif
#ifdef WNT
File gid_File_Lib_Rebasemsi
TXT_FILE_BODY;
Name = "rebase.dll";
Dir = gid_Dir_Program;
Styles = (PACKED,PATCH,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
End
#endif
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Lng, lng)
File gid_File_Lib_Localedata_En

4
scp2/source/ooo/ure.scp
View File

@@ -134,7 +134,7 @@ File gid_File_Exe_Javaldx
BIN_FILE_BODY;
Dir = gid_Dir_Ure_Bin;
Name = EXENAME(javaldx);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH);
// CompID = "291B5981-3E41-40E2-9C3F-115A7DF1C6A1";
End
#endif
@@ -336,7 +336,7 @@ File gid_File_Dl_Sunjavaplugin
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_BARE("sunjavaplugin");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH);
// CompID = "0AC6C688-876C-40C5-B24E-9257003FDC3E";
End
#endif

10
scp2/source/ooo/windowscustomaction_ooo.scp
View File

@@ -483,6 +483,16 @@ WindowsCustomAction gid_Customaction_ShowReleaseNotes2
Assignment1 = ("InstallExecuteSequence", "(Not Installed or ISPATCH) and Not REMOVE=\"ALL\"", "end");
End
WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
Name = "RebaseLibrariesOnProperties";
Typ = "65";
Source = "rebase.dll";
Target = "RebaseLibrariesOnProperties";
Inbinarytable = 1;
Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
End
WindowsCustomAction gid_Customaction_ShowSurvey
Name = "ShowSurveyAfterUninstall";
Typ = "65";

2
solenv/bin/checkapi
View File

@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
PS=":"
# cygwin:

2
solenv/bin/cwstestresult.pl
View File

@@ -103,6 +103,7 @@ sub testresult
my $result='';
if ( defined($childws) ) {
$opt_resultPage=SOAP::Data->type(string => $opt_resultPage);
my $id = $cws->eis_id();
if ( is_valid_cws($cws) ) {
$result=$eis->submitTestResult($id,$opt_testrunName,$opt_testrunPlatform, $opt_resultPage, $status);
@@ -110,6 +111,7 @@ sub testresult
print STDERR "cws is not valid";
}
} else {
$opt_resultPage=SOAP::Data->type(string => $opt_resultPage);
$result=$eis->submitTestResultMWS($masterws,$milestone,$opt_testrunName,$opt_testrunPlatform, $opt_resultPage, $status);
}

32
solenv/bin/gen_update_info.pl
View File

@@ -79,6 +79,32 @@ if( $^O =~ /cygwin/i ) {
}
# read openoffice.lst
# reading Globals section
unless(open(LSTFILE, "sed -n \"/^Globals\$/,/^}\$/ p\" $lstfile |")) {
print STDERR "Can't open $lstfile file: $!\n";
return;
}
while (<LSTFILE>) {
if( /\bPRODUCTNAME / ) {
chomp;
s/.*PRODUCTNAME //;
$productname = $_;
}
if( /\bPACKAGEVERSION / ) {
chomp;
s/.*PACKAGEVERSION //;
$productversion = $_;
}
if( /\bPRODUCTEDITION / ) {
chomp;
s/.*PRODUCTEDITION //;
$productedition = $_;
}
}
close(LSTFILE);
### may be hierarchical ...
if(open(LSTFILE, "sed -n \"/^$product:/,/^}\$/ p\" $lstfile |")) {
while (<LSTFILE>) {
@@ -94,6 +120,8 @@ if(open(LSTFILE, "sed -n \"/^$product:/,/^}\$/ p\" $lstfile |")) {
}
close(LSTFILE);
# Reading product specific settings
unless(open(LSTFILE, "sed -n \"/^$product\$/,/^}\$/ p\" $lstfile |")) {
print STDERR "Can't open $lstfile file: $!\n";
return;
@@ -105,9 +133,9 @@ while (<LSTFILE>) {
s/.*PRODUCTNAME //;
$productname = $_;
}
if( /\bPRODUCTVERSION / ) {
if( /\bPACKAGEVERSION / ) {
chomp;
s/.*PRODUCTVERSION //;
s/.*PACKAGEVERSION //;
$productversion = $_;
}
if( /\bPRODUCTEDITION / ) {

4
solenv/bin/mhids.pl
View File

@@ -71,9 +71,11 @@ sub cleandie
sub setcompiler
{
my $whichcom = $ENV{COM};
my $extra_cflags = $ENV{EXTRA_CFLAGS};
$extra_cflags = "" if (!$extra_cflags);
if ( "$whichcom" eq "GCC" ) {
$appext = ""; # windows for now
$compiler = "gcc -x c";
$compiler = "gcc -x c $extra_cflags";
$outbin_flag = "-o ";
$outobj_flag = "";
$objext = ".o";

12
solenv/bin/modules/installer/epmfile.pm
View File

@@ -1931,10 +1931,8 @@ sub include_patchinfos_into_pkginfo
$newline = "SUNW_REQUIRES=" . $requires . "\n";
add_one_line_into_file($changefile, $newline, $filename);
}
$newline = "SUNW_PATCH_PROPERTIES=\n";
add_one_line_into_file($changefile, $newline, $filename);
# $newline = "SUNW_PKGTYPE=usr\n";
# add_one_line_into_file($changefile, $newline, $filename);
@@ -1954,14 +1952,20 @@ sub get_solaris_language_for_langpack
$sollanguage =~ s/\-/\_/;
if ( $sollanguage eq "de" ) { $sollanguage = "de"; }
elsif ( $sollanguage eq "en_US" ) { $sollanguage = "en_AU,en_CA,en_GB,en_IE,en_MT,en_NZ,en_US,en_US.UTF-8"; }
elsif ( $sollanguage eq "es" ) { $sollanguage = "es"; }
elsif ( $sollanguage eq "fr" ) { $sollanguage = "fr"; }
elsif ( $sollanguage eq "hu" ) { $sollanguage = "hu_HU"; }
elsif ( $sollanguage eq "it" ) { $sollanguage = "it"; }
elsif ( $sollanguage eq "nl" ) { $sollanguage = "nl_BE,nl_NL"; }
elsif ( $sollanguage eq "pl" ) { $sollanguage = "pl_PL"; }
elsif ( $sollanguage eq "sv" ) { $sollanguage = "sv"; }
elsif ( $sollanguage eq "pt" ) { $sollanguage = "pt_PT"; }
elsif ( $sollanguage eq "pt_BR" ) { $sollanguage = "pt_BR"; }
elsif ( $sollanguage eq "ru" ) { $sollanguage = "ru_RU"; }
elsif ( $sollanguage eq "ja" ) { $sollanguage = "ja,ja_JP,ja_JP.PCK,ja_JP.UTF-8"; }
elsif ( $sollanguage eq "ko" ) { $sollanguage = "ko,ko.UTF-8"; }
elsif ( $sollanguage eq "zh_CN" ) { $sollanguage = "zh,zh.GBK,zh_CN,zh_CN.GB18030,zh.UTF-8"; }
elsif ( $sollanguage eq "zh_CN" ) { $sollanguage = "zh,zh.GBK,zh_CN.GB18030,zh.UTF-8"; }
elsif ( $sollanguage eq "zh_TW" ) { $sollanguage = "zh_TW,zh_TW.BIG5,zh_TW.UTF-8,zh_HK.BIG5HK,zh_HK.UTF-8"; }
return $sollanguage;
@@ -2156,7 +2160,7 @@ sub prepare_packages
if ( $installer::globals::issolarisx86build ) { fix_architecture_setting($changefile); }
if ( ! $installer::globals::patch ) { set_patchlist_in_pkginfo_for_respin($changefile, $filename, $variableshashref, $packagename); }
if ( $installer::globals::patch ) { include_patchinfos_into_pkginfo($changefile, $filename, $variableshashref); }
if (( $onepackage->{'language'} ) && ( $onepackage->{'language'} ne "" )) { include_languageinfos_into_pkginfo($changefile, $filename, $languagestringref, $onepackage, $variableshashref); }
if (( $onepackage->{'language'} ) && ( $onepackage->{'language'} ne "" ) && ( $onepackage->{'language'} ne "en-US" )) { include_languageinfos_into_pkginfo($changefile, $filename, $languagestringref, $onepackage, $variableshashref); }
installer::files::save_file($completefilename, $changefile);
my $prototypefilename = $packagename . ".prototype";

4
solenv/bin/modules/installer/exiter.pm
View File

@@ -107,6 +107,10 @@ sub exit_program
installer::logger::stoptime();
if (defined($installer::globals::exithandler)) {
&$installer::globals::exithandler;
}
exit(-1);
}

2
solenv/bin/modules/installer/globals.pm
View File

@@ -477,6 +477,8 @@ BEGIN
@emptypackages = ();
%fontpackageexists = ();
$exithandler = undef;
$plat = $^O;
if (( $plat =~ /MSWin/i ) || (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )))

3
solenv/bin/modules/installer/windows/admin.pm
View File

@@ -79,10 +79,11 @@ sub unpack_cabinet_file
my $systemcall = "";
if ( $^O =~ /cygwin/i ) {
my $localunpackdir = qx{cygpath -w "$unpackdir"};
chomp ($localunpackdir);
$localunpackdir =~ s/\\/\\\\/g;
$cabfilename =~ s/\\/\\\\/g;
$cabfilename =~ s/\s*$//g;
$systemcall = $expandfile . " " . $cabfilename . " -F:\* " . $localunpackdir;
$systemcall = $expandfile . " " . $cabfilename . " -F:\* " . $localunpackdir . " \> " . $expandlogfile;
}
else
{

5
solenv/bin/modules/installer/windows/property.pm
View File

@@ -304,7 +304,10 @@ sub set_important_properties
push(@{$propertyfile}, $onepropertyline);
}
my $onepropertyline = "IGNOREPREREQUIREDPATCH" . "\t" . "0" . "\n";
my $onepropertyline = "IGNOREPREREQUIREDPATCH" . "\t" . "1" . "\n";
push(@{$propertyfile}, $onepropertyline);
$onepropertyline = "DONTOPTIMIZELIBS" . "\t" . "0" . "\n";
push(@{$propertyfile}, $onepropertyline);
if ( $installer::globals::sundirexists )

4
solenv/bin/modules/installer/xpdinstaller.pm
View File

@@ -584,6 +584,7 @@ sub get_size_value
}
}
my ($rpmout, $error) = make_systemcall_allowing_error($systemcall, 0, 1);
$ENV{LD_LIBRARY_PATH} = $ld_library_backup;
# Evaluating an error, because of rpm problems with removed LD_LIBRARY_PATH
if ( $error )
{
@@ -592,7 +593,6 @@ sub get_size_value
($rpmout, $error) = make_systemcall_allowing_error($systemcall, 0, 0);
if ( $error ) { installer::exiter::exit_program("ERROR: rpm failed to query package!", "get_size_value"); }
}
$ENV{LD_LIBRARY_PATH} = $ld_library_backup;
$value = do_sum($rpmout); # adding all filesizes in bytes
$value = $value/1000;
@@ -722,6 +722,7 @@ sub get_fullpkgname_value
}
}
my ($returnarray, $error) = make_systemcall_allowing_error($systemcall, 0, 1);
$ENV{LD_LIBRARY_PATH} = $ld_library_backup;
# Evaluating an error, because of rpm problems with removed LD_LIBRARY_PATH
if ( $error )
{
@@ -731,7 +732,6 @@ sub get_fullpkgname_value
if ( $error ) { installer::exiter::exit_program("ERROR: rpm failed to query package!", "get_fullpkgname_value"); }
}
$value = ${$returnarray}[0];
$ENV{LD_LIBRARY_PATH} = $ld_library_backup;
installer::remover::remove_leading_and_ending_whitespaces(\$value);
my $rpmname = $packagename;

35
solenv/bin/soirpm.sh Executable file
View File

@@ -0,0 +1,35 @@
#!/bin/bash
#*************************************************************************
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: makefile,v $
#
# $Revision: 1.4 $
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#***********************************************************************/
LIBRPMBUILD=$(find ${COMPATH} -name 'librpmbuild-4.1*' -print)
# echo $(dirname $LIBRPMBUILD)
LD_LIBRARY_PATH=$(dirname ${LIBRPMBUILD}) ${BUILD_TOOLS?}/rpm "$@"
# LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
# ${BUILD_TOOLS?}/rpm "$@"

1
solenv/config/sdev300.ini
View File

@@ -991,7 +991,6 @@ unxlngx6
SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib -L%SOLAR_STLLIBPATH%
SOLAR_JAVA TRUE
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
WITH_MOZILLA NO
}
common0
{

80
solenv/inc/_tg_srs.mk
View File

@@ -15,7 +15,9 @@ ALLTAR : $(HIDSRS1PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES) $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS1NAME).dprr
@@ -31,7 +33,9 @@ $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS1NAME).srs: $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS1NAME).srs: $(SRC1FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -66,7 +70,9 @@ ALLTAR : $(HIDSRS2PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES) $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS2NAME).dprr
@@ -82,7 +88,9 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS2NAME).srs: $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS2NAME).srs: $(SRC2FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -117,7 +125,9 @@ ALLTAR : $(HIDSRS3PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES) $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS3NAME).dprr
@@ -133,7 +143,9 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS3NAME).srs: $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS3NAME).srs: $(SRC3FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -168,7 +180,9 @@ ALLTAR : $(HIDSRS4PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES) $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS4NAME).dprr
@@ -184,7 +198,9 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS4NAME).srs: $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS4NAME).srs: $(SRC4FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -219,7 +235,9 @@ ALLTAR : $(HIDSRS5PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES) $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS5NAME).dprr
@@ -235,7 +253,9 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS5NAME).srs: $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS5NAME).srs: $(SRC5FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -270,7 +290,9 @@ ALLTAR : $(HIDSRS6PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES) $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS6NAME).dprr
@@ -286,7 +308,9 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS6NAME).srs: $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS6NAME).srs: $(SRC6FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -321,7 +345,9 @@ ALLTAR : $(HIDSRS7PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES) $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS7NAME).dprr
@@ -337,7 +363,9 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS7NAME).srs: $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS7NAME).srs: $(SRC7FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -372,7 +400,9 @@ ALLTAR : $(HIDSRS8PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES) $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS8NAME).dprr
@@ -388,7 +418,9 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS8NAME).srs: $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS8NAME).srs: $(SRC8FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -423,7 +455,9 @@ ALLTAR : $(HIDSRS9PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES) $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS9NAME).dprr
@@ -439,7 +473,9 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS9NAME).srs: $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS9NAME).srs: $(SRC9FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -474,7 +510,9 @@ ALLTAR : $(HIDSRS10PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES) $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS10NAME).dprr
@@ -490,7 +528,9 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS10NAME).srs: $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS10NAME).srs: $(SRC10FILES)
.ENDIF # "$(WITH_LANG)"!=""

6
solenv/inc/minor.mk
View File

@@ -1,5 +1,5 @@
RSCVERSION=300
RSCREVISION=300m53(Build:9412)
BUILD=9412
LAST_MINOR=m53
RSCREVISION=300m54(Build:9416)
BUILD=9416
LAST_MINOR=m54
SOURCEVERSION=DEV300

8
solenv/inc/tg_srs.mk
View File

@@ -47,7 +47,9 @@ ALLTAR : $(HIDSRS$(TNR)PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES) $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr
@@ -63,7 +65,9 @@ $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZE
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS$(TNR)NAME).srs: $(LOCALIZE_ME_DEST)
$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
.ENDIF # "$(WITH_LANG)"!=""