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

Remove unneeded project and projectroot parameters

Browse Source 
Plus avoid use of Export::sLanguages member outside
of the class.

Change-Id: I33702816fdb4980d690cfe8fcd8cc3fbd0df1dd8
This commit is contained in:
Zolnai Tamás
2013-03-25 11:57:39 +01:00
parent 2d8547d095
commit 56a52889e6
29 changed files with 159 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crashrep/CustomTarget_crashrep_res.mk
View File

@@ -38,7 +38,7 @@ $(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep.ulf : \
$(call gb_Executable_get_runtime_dependencies,ulfex) $(call gb_Executable_get_runtime_dependencies,ulfex)
MERGEINPUT=`$(gb_MKTEMP)` && \ MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst $(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \ echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst $(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \
$(call gb_Executable_get_command,ulfex) -p crashrep -i $< -o $@ -m $${MERGEINPUT} -l all && \ $(call gb_Executable_get_command,ulfex) -i $< -o $@ -m $${MERGEINPUT} -l all && \
rm -f $${MERGEINPUT} rm -f $${MERGEINPUT}
# vim: set shiftwidth=4 tabstop=4 noexpandtab: # vim: set shiftwidth=4 tabstop=4 noexpandtab:

2
instsetoo_native/CustomTarget_install.mk
View File

@@ -44,7 +44,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf:
MERGEINPUT=`$(gb_MKTEMP)` && \ MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/instsetoo_native/inc_openoffice/windows/msi_languages.po) > $${MERGEINPUT} && \ echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/instsetoo_native/inc_openoffice/windows/msi_languages.po) > $${MERGEINPUT} && \
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
$(call gb_Executable_get_command,ulfex) -p instsetoo_native -i $< -o $@ -m $${MERGEINPUT} -l all ) && \ $(call gb_Executable_get_command,ulfex) -i $< -o $@ -m $${MERGEINPUT} -l all ) && \
rm -rf $${MERGEINPUT} rm -rf $${MERGEINPUT}
else else
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \

12
l10ntools/inc/cfgmerge.hxx
View File

@@ -144,7 +144,6 @@ public:
class CfgExport : public CfgParser class CfgExport : public CfgParser
{ {
private: private:
rtl::OString sPrj;
rtl::OString sPath; rtl::OString sPath;
std::vector<rtl::OString> aLanguages; std::vector<rtl::OString> aLanguages;
@@ -160,9 +159,9 @@ protected:
void Output(const rtl::OString& rOutput); void Output(const rtl::OString& rOutput);
public: public:
CfgExport( CfgExport(
const rtl::OString &rOutputFile, const OString &rOutputFile,
const rtl::OString &rProject, const OString &rFilePath,
const rtl::OString &rFilePath const OString &rLanguage
); );
~CfgExport(); ~CfgExport();
}; };
@@ -190,8 +189,9 @@ protected:
void Output(const rtl::OString& rOutput); void Output(const rtl::OString& rOutput);
public: public:
CfgMerge(const rtl::OString &rMergeSource, CfgMerge(
const rtl::OString &rOutputFile, const rtl::OString &rFilename); const OString &rMergeSource, const OString &rOutputFile,
const OString &rFilename, const OString &rLanguage );
~CfgMerge(); ~CfgMerge();
}; };

12
l10ntools/inc/export.hxx
View File

@@ -247,20 +247,16 @@ class ParserQueue;
//result type of handleArguments() //result type of handleArguments()
struct HandledArgs struct HandledArgs
{ {
OString m_sPrj;
OString m_sPrjRoot;
OString m_sInputFile; OString m_sInputFile;
OString m_sOutputFile; OString m_sOutputFile;
OString m_sMergeSrc; OString m_sMergeSrc;
OString m_sLanguages; OString m_sLanguage;
bool m_bMergeMode; bool m_bMergeMode;
HandledArgs() HandledArgs()
: m_sPrj( OString() ) : m_sInputFile( OString() )
, m_sPrjRoot( OString() )
, m_sInputFile( OString() )
, m_sOutputFile( OString() ) , m_sOutputFile( OString() )
, m_sMergeSrc( OString() ) , m_sMergeSrc( OString() )
, m_sLanguages( OString() ) , m_sLanguage( OString() )
, m_bMergeMode( false ) , m_bMergeMode( false )
{} {}
}; };
@@ -289,8 +285,6 @@ private:
std::size_t nListIndex; std::size_t nListIndex;
std::size_t nListLevel; std::size_t nListLevel;
bool bSkipFile; bool bSkipFile;
rtl::OString sProject;
rtl::OString sRoot;
sal_Bool bMergeMode; sal_Bool bMergeMode;
rtl::OString sMergeSrc; rtl::OString sMergeSrc;
rtl::OString sLastListLine; rtl::OString sLastListLine;

4
l10ntools/inc/helpmerge.hxx
View File

@@ -44,8 +44,8 @@ public:
/// Method append a PO file with the content of a parsed XML file /// Method append a PO file with the content of a parsed XML file
/// @PRECOND rHelpFile is valid /// @PRECOND rHelpFile is valid
static bool CreatePO( const rtl::OString &rPOFile_in, const rtl::OString &sHelpFile, static bool CreatePO( const OString &rPOFile_in, const OString &sHelpFile, const OString &rLanguage,
XMLFile *pXmlFile, const rtl::OString &rGsi1 ); XMLFile *pXmlFile, const OString &rGsi1 );
/// Method merges the String from the POfile into XMLfile. Both Strings must /// Method merges the String from the POfile into XMLfile. Both Strings must
/// point to existing files. /// point to existing files.

6
l10ntools/inc/lngmerge.hxx
View File

@@ -53,9 +53,9 @@ public:
sal_Bool bULFFormat); sal_Bool bULFFormat);
~LngParser(); ~LngParser();
sal_Bool CreatePO( const rtl::OString &rPOFile ); sal_Bool CreatePO( const OString &rPOFile, const OString &rLanguage );
sal_Bool Merge(const rtl::OString &rPOFile, sal_Bool Merge(const OString &rPOFile, const OString &rDestinationFile,
const rtl::OString &rDestinationFile); const OString &rLanguage );
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
l10ntools/inc/xrmmerge.hxx
View File

@@ -81,7 +81,6 @@ class XRMResExport : public XRMResParser
{ {
private: private:
ResData *pResData; ResData *pResData;
rtl::OString sPrj;
rtl::OString sPath; rtl::OString sPath;
PoOfstream pOutputStream; PoOfstream pOutputStream;
protected: protected:
@@ -101,9 +100,8 @@ protected:
public: public:
XRMResExport( XRMResExport(
const rtl::OString &rOutputFile, const OString &rOutputFile,
const rtl::OString &rProject, const OString &rFilePath
const rtl::OString &rFilePath
); );
virtual ~XRMResExport(); virtual ~XRMResExport();
}; };

33
l10ntools/source/cfgmerge.cxx
View File

@@ -50,10 +50,9 @@ FILE * init(int argc, char ** argv) {
HandledArgs aArgs; HandledArgs aArgs;
if ( !Export::handleArguments(argc, argv, aArgs) ) if ( !Export::handleArguments(argc, argv, aArgs) )
{ {
Export::writeUsage("cfgex","xcu"); Export::writeUsage("cfgex","*.xcu");
std::exit(EXIT_FAILURE); std::exit(EXIT_FAILURE);
} }
Export::InitLanguages();
global::inputPathname = aArgs.m_sInputFile; global::inputPathname = aArgs.m_sInputFile;
FILE * pFile = std::fopen(global::inputPathname.getStr(), "r"); FILE * pFile = std::fopen(global::inputPathname.getStr(), "r");
@@ -67,13 +66,12 @@ FILE * init(int argc, char ** argv) {
if (aArgs.m_bMergeMode) { if (aArgs.m_bMergeMode) {
global::parser.reset( global::parser.reset(
new CfgMerge( new CfgMerge(
aArgs.m_sMergeSrc.getStr(), aArgs.m_sOutputFile.getStr(), aArgs.m_sMergeSrc, aArgs.m_sOutputFile,
global::inputPathname)); global::inputPathname, aArgs.m_sLanguage ));
} else { } else {
global::parser.reset( global::parser.reset(
new CfgExport( new CfgExport(
aArgs.m_sOutputFile.getStr(), aArgs.m_sPrj.getStr(), aArgs.m_sOutputFile, global::inputPathname, aArgs.m_sLanguage ));
global::inputPathname ));
} }
return pFile; return pFile;
@@ -359,13 +357,12 @@ void CfgParser::Error(const rtl::OString& rError)
/*****************************************************************************/ /*****************************************************************************/
CfgExport::CfgExport( CfgExport::CfgExport(
const rtl::OString &rOutputFile, const OString &rOutputFile,
const rtl::OString &rProject, const OString &rFilePath,
const rtl::OString &rFilePath const OString &rLanguage
) )
/*****************************************************************************/ /*****************************************************************************/
: sPrj( rProject ), : sPath( rFilePath )
sPath( rFilePath )
{ {
pOutputStream.open( rOutputFile, PoOfstream::APP ); pOutputStream.open( rOutputFile, PoOfstream::APP );
if (!pOutputStream.isOpen()) if (!pOutputStream.isOpen())
@@ -373,8 +370,7 @@ CfgExport::CfgExport(
std::cerr << "ERROR: Unable to open output file: " << rOutputFile << "\n"; std::cerr << "ERROR: Unable to open output file: " << rOutputFile << "\n";
std::exit(EXIT_FAILURE); std::exit(EXIT_FAILURE);
} }
Export::InitLanguages( false ); aLanguages.push_back( rLanguage );
aLanguages = Export::GetLanguages();
} }
/*****************************************************************************/ /*****************************************************************************/
@@ -435,8 +431,8 @@ void CfgExport::WorkOnText(
// //
CfgMerge::CfgMerge( CfgMerge::CfgMerge(
const rtl::OString &rMergeSource, const rtl::OString &rOutputFile, const OString &rMergeSource, const OString &rOutputFile,
const rtl::OString &rFilename) const OString &rFilename, const OString &rLanguage )
: pMergeDataFile( NULL ), : pMergeDataFile( NULL ),
pResData( NULL ), pResData( NULL ),
sFilename( rFilename ), sFilename( rFilename ),
@@ -454,15 +450,14 @@ CfgMerge::CfgMerge(
{ {
pMergeDataFile = new MergeDataFile( pMergeDataFile = new MergeDataFile(
rMergeSource, global::inputPathname, true ); rMergeSource, global::inputPathname, true );
if (Export::sLanguages.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("ALL"))) if (rLanguage.equalsIgnoreAsciiCase("ALL") )
{ {
Export::SetLanguages( pMergeDataFile->GetLanguages() );
aLanguages = pMergeDataFile->GetLanguages(); aLanguages = pMergeDataFile->GetLanguages();
} }
else aLanguages = Export::GetLanguages(); else aLanguages.push_back(rLanguage);
} }
else else
aLanguages = Export::GetLanguages(); aLanguages.push_back(rLanguage);
} }
/*****************************************************************************/ /*****************************************************************************/

11
l10ntools/source/export.cxx
View File

@@ -41,8 +41,6 @@ MergeDataFile * pMergeDataFile = 0; //TODO
namespace global { namespace global {
OString prj;
OString prjRoot;
OString inputPathname; OString inputPathname;
boost::scoped_ptr< Export > exporter; boost::scoped_ptr< Export > exporter;
@@ -56,12 +54,11 @@ FILE * init(int argc, char ** argv) {
HandledArgs aArgs; HandledArgs aArgs;
if ( !Export::handleArguments(argc, argv, aArgs) ) if ( !Export::handleArguments(argc, argv, aArgs) )
{ {
Export::writeUsage("transex3","src/hrc"); Export::writeUsage("transex3","*.src/*.hrc");
std::exit(EXIT_FAILURE); std::exit(EXIT_FAILURE);
} }
Export::sLanguages = aArgs.m_sLanguage;
Export::InitLanguages(); Export::InitLanguages();
global::prj = aArgs.m_sPrj;
global::prjRoot = aArgs.m_sPrjRoot;
global::inputPathname = aArgs.m_sInputFile; global::inputPathname = aArgs.m_sInputFile;
FILE * pFile = std::fopen(global::inputPathname.getStr(), "r"); FILE * pFile = std::fopen(global::inputPathname.getStr(), "r");
@@ -172,8 +169,6 @@ Export::Export(const rtl::OString &rOutput)
nListIndex( 0 ), nListIndex( 0 ),
nListLevel( 0 ), nListLevel( 0 ),
bSkipFile( false ), bSkipFile( false ),
sProject( global::prj ),
sRoot( global::prjRoot ),
bMergeMode( false ), bMergeMode( false ),
bError( sal_False ), bError( sal_False ),
bReadOver( sal_False ), bReadOver( sal_False ),
@@ -203,8 +198,6 @@ Export::Export(const rtl::OString &rMergeSource, const rtl::OString &rOutput)
nListIndex( 0 ), nListIndex( 0 ),
nListLevel( 0 ), nListLevel( 0 ),
bSkipFile( false ), bSkipFile( false ),
sProject( global::prj ),
sRoot( global::prjRoot ),
bMergeMode( sal_True ), bMergeMode( sal_True ),
sMergeSrc( rMergeSource ), sMergeSrc( rMergeSource ),
bError( sal_False ), bError( sal_False ),

32
l10ntools/source/export2.cxx
View File

@@ -94,7 +94,6 @@ bool Export::handleArguments(
int argc, char * argv[], HandledArgs& o_aHandledArgs) int argc, char * argv[], HandledArgs& o_aHandledArgs)
{ {
o_aHandledArgs = HandledArgs(); o_aHandledArgs = HandledArgs();
sLanguages = "";
sal_uInt16 nState = STATE_NON; sal_uInt16 nState = STATE_NON;
for( int i = 1; i < argc; i++ ) for( int i = 1; i < argc; i++ )
@@ -107,14 +106,6 @@ bool Export::handleArguments(
{ {
nState = STATE_OUTPUT; // next token specifies the dest file nState = STATE_OUTPUT; // next token specifies the dest file
} }
else if ( OString( argv[ i ] ).toAsciiUpperCase() == "-P" )
{
nState = STATE_PRJ; // next token specifies the cur. project
}
else if ( OString( argv[ i ] ).toAsciiUpperCase() == "-R" )
{
nState = STATE_ROOT; // next token specifies path to project root
}
else if ( OString( argv[ i ] ).toAsciiUpperCase() == "-M" ) else if ( OString( argv[ i ] ).toAsciiUpperCase() == "-M" )
{ {
nState = STATE_MERGESRC; // next token specifies the merge database nState = STATE_MERGESRC; // next token specifies the merge database
@@ -141,16 +132,6 @@ bool Export::handleArguments(
o_aHandledArgs.m_sOutputFile = OString( argv[i] ); o_aHandledArgs.m_sOutputFile = OString( argv[i] );
} }
break; break;
case STATE_PRJ:
{
o_aHandledArgs.m_sPrj = OString( argv[i] );
}
break;
case STATE_ROOT:
{
o_aHandledArgs.m_sPrjRoot = OString( argv[i] );
}
break;
case STATE_MERGESRC: case STATE_MERGESRC:
{ {
o_aHandledArgs.m_sMergeSrc = OString( argv[i] ); o_aHandledArgs.m_sMergeSrc = OString( argv[i] );
@@ -159,7 +140,7 @@ bool Export::handleArguments(
break; break;
case STATE_LANGUAGES: case STATE_LANGUAGES:
{ {
sLanguages = OString( argv[i] ); o_aHandledArgs.m_sLanguage = OString( argv[i] );
} }
break; break;
} }
@@ -181,15 +162,12 @@ void Export::writeUsage(const OString& rName, const OString& rFileType)
{ {
std::cout std::cout
<< " Syntax: " << rName.getStr() << " Syntax: " << rName.getStr()
<< " [-p Prj] [-r PrjRoot] -i FileIn -o FileOut" << " -i FileIn -o FileOut [-m DataBase] [-l Lang]\n"
<< " [-m DataBase] [-l l1,l2,...]\n" << " FileIn: Source files (" << rFileType.getStr() << ")\n"
<< " Prj: Project\n"
<< " PrjRoot: Path to project root (../.. etc.)\n"
<< " FileIn: Source files (*." << rFileType.getStr() << ")\n"
<< " FileOut: Destination file (*.*)\n" << " FileOut: Destination file (*.*)\n"
<< " DataBase: Mergedata (*.po)\n" << " DataBase: Mergedata (*.po)\n"
<< " -l: Restrict the handled languages; l1, l2, ... are elements of" << " Lang: Restrict the handled languag; one element of\n"
<< " (de, en-US, ...)\n"; << " (de, en-US, ...) or all\n";
} }
void Export::writePoEntry( void Export::writePoEntry(

15
l10ntools/source/helpex.cxx
View File

@@ -36,17 +36,14 @@
void WriteUsage() void WriteUsage()
{ {
std::cout std::cout
<< "Syntax: Helpex [-p Prj] [-r Root] -[m]i FileIn -o FileOut" << " Syntax: Helpex -[m]i FileIn -o FileOut [-m DataBase] [-l Lang]\n"
<< " [-m DataBase] [-l l1,l2,...]\n"
<< " Prj: Project\n"
<< " Root: Path to project root (../.. etc.)\n"
<< " FileIn + i: Source file (*.xhp)\n" << " FileIn + i: Source file (*.xhp)\n"
<< " FileIn + -mi: File including paths of source files" << " FileIn + -mi: File including paths of source files"
<< " (only for merge)" << " (only for merge)"
<< " FileOut: Destination file (*.*) or files (in case of -mi)\n" << " FileOut: Destination file (*.*) or files (in case of -mi)\n"
<< " DataBase: Mergedata (*.po)\n" << " DataBase: Mergedata (*.po)\n"
<< " -l: Restrict the handled languages; l1, l2, ... are elements of" << " Lang: Restrict the handled languages; one element of\n"
<< " (de, en-US, ...)\n"; << " (de, en-US, ...) or all\n";
} }
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
@@ -93,7 +90,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
aArgs.m_sOutputFile + aArgs.m_sOutputFile +
sXhpFile.copy( sXhpFile.lastIndexOf("/") )); sXhpFile.copy( sXhpFile.lastIndexOf("/") ));
if( !aParser.Merge( aArgs.m_sMergeSrc, sOutput, if( !aParser.Merge( aArgs.m_sMergeSrc, sOutput,
Export::sLanguages, aMergeDataFile )) aArgs.m_sLanguage, aMergeDataFile ))
{ {
hasNoError = false; hasNoError = false;
} }
@@ -109,7 +106,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
hasNoError = hasNoError =
aParser.Merge( aParser.Merge(
aArgs.m_sMergeSrc, aArgs.m_sOutputFile, aArgs.m_sMergeSrc, aArgs.m_sOutputFile,
Export::sLanguages , aMergeDataFile ); aArgs.m_sLanguage, aMergeDataFile );
} }
} }
else else
@@ -117,7 +114,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
HelpParser aParser( aArgs.m_sInputFile ); HelpParser aParser( aArgs.m_sInputFile );
hasNoError = hasNoError =
aParser.CreatePO( aParser.CreatePO(
aArgs.m_sOutputFile, aArgs.m_sInputFile, aArgs.m_sOutputFile, aArgs.m_sInputFile, aArgs.m_sLanguage,
new XMLFile( OUString('0') ), "help" ); new XMLFile( OUString('0') ), "help" );
} }

8
l10ntools/source/helpmerge.cxx
View File

@@ -75,8 +75,8 @@ HelpParser::HelpParser( const rtl::OString &rHelpFile )
/*****************************************************************************/ /*****************************************************************************/
bool HelpParser::CreatePO( bool HelpParser::CreatePO(
/*****************************************************************************/ /*****************************************************************************/
const rtl::OString &rPOFile_in, const rtl::OString &sHelpFile, const OString &rPOFile_in, const OString &sHelpFile, const OString &rLanguage,
XMLFile *pXmlFile, const rtl::OString &rGsi1){ XMLFile *pXmlFile, const OString &rGsi1){
SimpleXMLParser aParser; SimpleXMLParser aParser;
rtl::OUString sXmlFile( rtl::OUString sXmlFile(
rtl::OStringToOUString(sHelpFile, RTL_TEXTENCODING_ASCII_US)); rtl::OStringToOUString(sHelpFile, RTL_TEXTENCODING_ASCII_US));
@@ -110,8 +110,8 @@ bool HelpParser::CreatePO(
LangHashMap* pElem; LangHashMap* pElem;
XMLElement* pXMLElement = NULL; XMLElement* pXMLElement = NULL;
Export::InitLanguages( false ); std::vector<rtl::OString> aLanguages;
std::vector<rtl::OString> aLanguages = Export::GetLanguages(); aLanguages.push_back( rLanguage );
std::vector<rtl::OString> order = file->getOrder(); std::vector<rtl::OString> order = file->getOrder();
std::vector<rtl::OString>::iterator pos; std::vector<rtl::OString>::iterator pos;

7
l10ntools/source/lngex.cxx
View File

@@ -30,15 +30,16 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
HandledArgs aArgs; HandledArgs aArgs;
if ( !Export::handleArguments(argc, argv, aArgs) ) if ( !Export::handleArguments(argc, argv, aArgs) )
{ {
Export::writeUsage("ulfex","ulf"); Export::writeUsage("ulfex","*.ulf");
return 1; return 1;
} }
LngParser aParser( aArgs.m_sInputFile, true ); LngParser aParser( aArgs.m_sInputFile, true );
if ( aArgs.m_bMergeMode ) if ( aArgs.m_bMergeMode )
aParser.Merge(aArgs.m_sMergeSrc, aArgs.m_sOutputFile); aParser.Merge(
aArgs.m_sMergeSrc, aArgs.m_sOutputFile, aArgs.m_sLanguage );
else else
aParser.CreatePO( aArgs.m_sOutputFile ); aParser.CreatePO( aArgs.m_sOutputFile, aArgs.m_sLanguage );
return 0; return 0;
} }

20
l10ntools/source/lngmerge.cxx
View File

@@ -80,11 +80,11 @@ LngParser::~LngParser()
delete pLines; delete pLines;
} }
sal_Bool LngParser::CreatePO( const rtl::OString &rPOFile ) sal_Bool LngParser::CreatePO(
const OString &rPOFile,
const OString &rLanguage )
{ {
aLanguages.push_back(rLanguage);
Export::InitLanguages( false );
aLanguages = Export::GetLanguages();
PoOfstream aPOStream( rPOFile, PoOfstream::APP ); PoOfstream aPOStream( rPOFile, PoOfstream::APP );
if (!aPOStream.isOpen()) { if (!aPOStream.isOpen()) {
std::cerr << "Ulfex error: Can't open po file:" << rPOFile.getStr() << "\n"; std::cerr << "Ulfex error: Can't open po file:" << rPOFile.getStr() << "\n";
@@ -161,10 +161,10 @@ void LngParser::ReadLine(const rtl::OString &rLine_in,
} }
sal_Bool LngParser::Merge( sal_Bool LngParser::Merge(
const rtl::OString &rPOFile, const OString &rPOFile,
const rtl::OString &rDestinationFile) const OString &rDestinationFile,
const OString &rLanguage )
{ {
Export::InitLanguages( true );
std::ofstream aDestination( std::ofstream aDestination(
rDestinationFile.getStr(), std::ios_base::out | std::ios_base::trunc); rDestinationFile.getStr(), std::ios_base::out | std::ios_base::trunc);
if (!aDestination.is_open()) { if (!aDestination.is_open()) {
@@ -173,10 +173,8 @@ sal_Bool LngParser::Merge(
nError = LNG_OK; nError = LNG_OK;
MergeDataFile aMergeDataFile( rPOFile, sSource, false, true ); MergeDataFile aMergeDataFile( rPOFile, sSource, false, true );
rtl::OString sTmp( Export::sLanguages ); if( rLanguage.equalsIgnoreAsciiCase("ALL") )
if( sTmp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("ALL")) ) aLanguages = aMergeDataFile.GetLanguages();
Export::SetLanguages( aMergeDataFile.GetLanguages() );
aLanguages = Export::GetLanguages();
size_t nPos = 0; size_t nPos = 0;
sal_Bool bGroup = sal_False; sal_Bool bGroup = sal_False;

45
l10ntools/source/localize.cxx
View File

@@ -127,7 +127,6 @@ bool passesPositiveList(const OUString& rUrl) {
} }
void handleCommand( void handleCommand(
const OString& rProject, const OString& rProjectRoot,
const OString& rInPath, const OString& rOutPath, const OString& rInPath, const OString& rOutPath,
const OString& rExecutable) const OString& rExecutable)
{ {
@@ -136,10 +135,6 @@ void handleCommand(
buf.append(OString(getenv("INPATH_FOR_BUILD"))); buf.append(OString(getenv("INPATH_FOR_BUILD")));
buf.append("/bin/"); buf.append("/bin/");
buf.append(rExecutable); buf.append(rExecutable);
buf.append(" -p ");
buf.append(rProject);
buf.append(" -r ");
buf.append(rProjectRoot);
buf.append(" -i "); buf.append(" -i ");
buf.append(rInPath); buf.append(rInPath);
buf.append(" -o "); buf.append(" -o ");
@@ -195,9 +190,8 @@ void InitPoFile(
} }
bool handleFile( bool handleFile(
const OString& rProject, const OString& rProjectRoot, const OString& rProject, const OUString& rUrl,
const OUString& rUrl, const OString& rPotDir, const OString& rPotDir, bool bInitPoFile )
bool bInitPoFile )
{ {
struct Command { struct Command {
char const * extension; char const * extension;
@@ -243,9 +237,7 @@ bool handleFile(
{ {
InitPoFile(rProject, sInPath, rPotDir, sOutPath); InitPoFile(rProject, sInPath, rPotDir, sOutPath);
} }
handleCommand( handleCommand(sInPath, sOutPath, commands[i].executable);
rProject, rProjectRoot, sInPath,
sOutPath, commands[i].executable);
return true; return true;
} }
break; break;
@@ -256,7 +248,7 @@ bool handleFile(
void handleFilesOfDir( void handleFilesOfDir(
std::vector<OUString>& aFiles, const OString& rProject, std::vector<OUString>& aFiles, const OString& rProject,
const OString& rProjectRoot, const OString& rPotDir ) const OString& rPotDir )
{ {
///Handle files in lexical order ///Handle files in lexical order
std::sort(aFiles.begin(), aFiles.end()); std::sort(aFiles.begin(), aFiles.end());
@@ -267,7 +259,7 @@ void handleFilesOfDir(
for( citer_t aIt = aFiles.begin(); aIt != aFiles.end(); ++aIt ) for( citer_t aIt = aFiles.begin(); aIt != aFiles.end(); ++aIt )
{ {
if (handleFile( rProject, rProjectRoot, *aIt, rPotDir, bFirstLocFile)) if (handleFile( rProject, *aIt, rPotDir, bFirstLocFile))
{ {
bFirstLocFile = false; bFirstLocFile = false;
} }
@@ -380,13 +372,10 @@ bool includeProject(const OString& rProject) {
/// is a project directory; 2 if this is a directory inside a project /// is a project directory; 2 if this is a directory inside a project
/// ///
/// @param rProject the name of the project (empty and ignored if nLevel <= 0) /// @param rProject the name of the project (empty and ignored if nLevel <= 0)
///
/// @param rProjectRoo the relative path back to the project root (empty and ignored if
/// nLevel <= 0)
/// @param rPotDir the path of pot directory /// @param rPotDir the path of pot directory
void handleDirectory( void handleDirectory(
const OUString& rUrl, int nLevel, const OString& rProject, const OUString& rUrl, int nLevel,
const OString& rProjectRoot, const OString& rPotDir) const OString& rProject, const OString& rPotDir)
{ {
osl::Directory dir(rUrl); osl::Directory dir(rUrl);
if (dir.open() != osl::FileBase::E_None) { if (dir.open() != osl::FileBase::E_None) {
@@ -418,34 +407,26 @@ void handleDirectory(
case -1: // the clone or src directory case -1: // the clone or src directory
if (stat.getFileType() == osl::FileStatus::Directory) { if (stat.getFileType() == osl::FileStatus::Directory) {
handleDirectory( handleDirectory(
stat.getFileURL(), 0, OString(), stat.getFileURL(), 0, OString(), rPotDir);
OString(), rPotDir);
} }
break; break;
case 0: // a root directory case 0: // a root directory
if (stat.getFileType() == osl::FileStatus::Directory) { if (stat.getFileType() == osl::FileStatus::Directory) {
if (includeProject(sDirName)) { if (includeProject(sDirName)) {
handleDirectory( handleDirectory(
stat.getFileURL(), 1, sDirName, stat.getFileURL(), 1, sDirName, rPotDir.concat("/").concat(sDirName));
OString(), rPotDir.concat("/").concat(sDirName));
} else if ( sDirName == "clone" || } else if ( sDirName == "clone" ||
sDirName == "src" ) sDirName == "src" )
{ {
handleDirectory( handleDirectory( stat.getFileURL(), -1, OString(), rPotDir);
stat.getFileURL(), -1, OString(), OString(), rPotDir);
} }
} }
break; break;
default: default:
if (stat.getFileType() == osl::FileStatus::Directory) if (stat.getFileType() == osl::FileStatus::Directory)
{ {
OString pr(rProjectRoot);
if (!pr.isEmpty()) {
pr += OString('/');
}
pr += OString("..");
handleDirectory( handleDirectory(
stat.getFileURL(), 2, rProject, pr, rPotDir.concat("/").concat(sDirName)); stat.getFileURL(), 2, rProject, rPotDir.concat("/").concat(sDirName));
} }
else else
{ {
@@ -457,7 +438,7 @@ void handleDirectory(
if( !aFileNames.empty() ) if( !aFileNames.empty() )
{ {
handleFilesOfDir( aFileNames, rProject, rProjectRoot, rPotDir ); handleFilesOfDir( aFileNames, rProject, rPotDir );
} }
if (dir.close() != osl::FileBase::E_None) { if (dir.close() != osl::FileBase::E_None) {
@@ -487,7 +468,7 @@ void handleProjects(char * sSourceRoot, char const * sDestRoot)
<< " root16: " << OUStringToOString(root16, RTL_TEXTENCODING_ASCII_US).getStr() << "\n"; << " root16: " << OUStringToOString(root16, RTL_TEXTENCODING_ASCII_US).getStr() << "\n";
throw false; //TODO throw false; //TODO
} }
handleDirectory(rootUrl, 0, OString(), OString(), OString(sDestRoot)); handleDirectory(rootUrl, 0, OString(), OString(sDestRoot));
} }
} }

4
l10ntools/source/propex.cxx
View File

@@ -17,12 +17,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
HandledArgs aArgs; HandledArgs aArgs;
if( !Export::handleArguments(argc, argv, aArgs) ) if( !Export::handleArguments(argc, argv, aArgs) )
{ {
Export::writeUsage("propex","properties"); Export::writeUsage("propex","*.properties");
return 1; return 1;
} }
PropParser aParser( PropParser aParser(
aArgs.m_sInputFile, Export::sLanguages, aArgs.m_bMergeMode ); aArgs.m_sInputFile, aArgs.m_sLanguage, aArgs.m_bMergeMode );
if( !aParser.isInitialized() ) if( !aParser.isInitialized() )
{ {
return 1; return 1;

24
l10ntools/source/stringex.cxx
View File

@@ -13,40 +13,24 @@
#include "export.hxx" #include "export.hxx"
#include "stringmerge.hxx" #include "stringmerge.hxx"
void WriteUsage()
{
std::cout
<< "Syntax: stringex [-p Prj] [-r Root] -i FileIn -o FileOut"
<< " [-m DataBase] [-l l1,l2,...]\n"
<< " Prj: Project\n"
<< " Root: Path to project root (../.. etc.)\n"
<< " FileIn: Source files (strings.xml)\n"
<< " FileOut: Destination file (*.*)\n"
<< " DataBase: Mergedata (*.po)\n"
<< " -l: Restrict the handled languages; l1, l2, ... are elements of"
<< " (de, en-US, ...)\n";
}
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
{ {
HandledArgs aArgs; HandledArgs aArgs;
if( !Export::handleArguments(argc, argv, aArgs) ) if( !Export::handleArguments(argc, argv, aArgs) )
{ {
WriteUsage(); Export::writeUsage("stringex","string.xml");
return 1; return 1;
} }
StringParser aParser(aArgs.m_sInputFile, Export::sLanguages); StringParser aParser(aArgs.m_sInputFile, aArgs.m_sLanguage);
if( !aParser.isInitialized() ) if( !aParser.isInitialized() )
{ {
return 1; return 1;
} }
if( aArgs.m_bMergeMode || aArgs.m_sPrj.isEmpty() ) if( aArgs.m_bMergeMode )
{ {
aParser.Merge( aParser.Merge( aArgs.m_sMergeSrc, aArgs.m_sOutputFile );
aArgs.m_sMergeSrc, aArgs.m_sOutputFile );
} }
else else
{ {

35
l10ntools/source/treex.cxx
View File

@@ -8,6 +8,7 @@
*/ */
#include <iostream> #include <iostream>
#include <cstring>
#include "sal/main.h" #include "sal/main.h"
#include "export.hxx" #include "export.hxx"
@@ -16,21 +17,34 @@
void WriteUsage() void WriteUsage()
{ {
std::cout std::cout
<< "Syntax: Treex [-p Prj] [-r Root] -i FileIn -o FileOut" << "Syntax: Treex [-r Root] -i FileIn -o FileOut"
<< " [-m DataBase] [-l l1,l2,...]\n" << " [-m DataBase] [-l Lang]\n"
<< " Prj: Project\n" << " Root: Path to root of localized xhp files\n"
<< " Root: Path to project root (../.. etc.)\n"
<< " or path to root of localized xhp files\n"
<< " FileIn: Source files (*.tree)\n" << " FileIn: Source files (*.tree)\n"
<< " FileOut: Destination file (*.*)\n" << " FileOut: Destination file (*.*)\n"
<< " DataBase: Mergedata (*.po)\n" << " DataBase: Mergedata (*.po)\n"
<< " -l: Restrict the handled languages; l1, l2, ... are elements of" << " Lang: Restrict the handled languages; one element of\n"
<< " (de, en-US, ...)\n"; << " (de, en-US, ...) or all\n";
} }
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
{ {
OString sXHPRoot;
for (int nIndex = 1; nIndex != argc; ++nIndex)
{
if (std::strcmp(argv[nIndex], "-r") == 0)
{
sXHPRoot = OString( argv[nIndex + 1] );
for( int nIndex2 = nIndex+3; nIndex2 < argc; nIndex2 = nIndex2 + 2 )
{
argv[nIndex-3] = argv[nIndex-1];
argv[nIndex-2] = argv[nIndex];
}
argc = argc - 2;
break;
}
}
HandledArgs aArgs; HandledArgs aArgs;
if( !Export::handleArguments(argc, argv, aArgs) ) if( !Export::handleArguments(argc, argv, aArgs) )
{ {
@@ -38,16 +52,15 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
return 1; return 1;
} }
TreeParser aParser(aArgs.m_sInputFile, Export::sLanguages); TreeParser aParser(aArgs.m_sInputFile, aArgs.m_sLanguage );
if( !aParser.isInitialized() ) if( !aParser.isInitialized() )
{ {
return 1; return 1;
} }
if( aArgs.m_bMergeMode || aArgs.m_sPrj.isEmpty() ) if( aArgs.m_bMergeMode || !sXHPRoot.isEmpty() )
{ {
aParser.Merge( aParser.Merge( aArgs.m_sMergeSrc, aArgs.m_sOutputFile, sXHPRoot );
aArgs.m_sMergeSrc, aArgs.m_sOutputFile, aArgs.m_sPrjRoot );
} }
else else
{ {

31
l10ntools/source/uimerge.cxx
View File

@@ -28,8 +28,6 @@
#include <fstream> #include <fstream>
#include <vector> #include <vector>
rtl::OString sPrj;
rtl::OString sPrjRoot;
rtl::OString sInputFileName; rtl::OString sInputFileName;
rtl::OString sOutputFile; rtl::OString sOutputFile;
@@ -186,9 +184,10 @@ namespace
} }
bool Merge( bool Merge(
const rtl::OString &rSDFFile, const OString &rPOFile,
const rtl::OString &rSourceFile, const OString &rSourceFile,
const rtl::OString &rDestinationDir) const OString &rDestinationDir,
const OString &rLanguage )
{ {
{ {
bool bDestinationIsDir(false); bool bDestinationIsDir(false);
@@ -213,14 +212,12 @@ bool Merge(
} }
} }
Export::InitLanguages( true ); MergeDataFile aMergeDataFile( rPOFile, rSourceFile, sal_False );
std::vector<rtl::OString> aLanguages;
MergeDataFile aMergeDataFile( rSDFFile, rSourceFile, sal_False ); if( rLanguage.equalsIgnoreAsciiCase("ALL") )
rtl::OString sTmp( Export::sLanguages ); aLanguages = aMergeDataFile.GetLanguages();
if( sTmp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("ALL")) ) else
Export::SetLanguages( aMergeDataFile.GetLanguages() ); aLanguages.push_back(rLanguage);
std::vector<rtl::OString> aLanguages = Export::GetLanguages();
const MergeDataHashMap& rMap = aMergeDataFile.getMap(); const MergeDataHashMap& rMap = aMergeDataFile.getMap();
const rtl::OString aDestinationDir(rDestinationDir + "/"); const rtl::OString aDestinationDir(rDestinationDir + "/");
@@ -246,18 +243,16 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
HandledArgs aArgs; HandledArgs aArgs;
if ( !Export::handleArguments(argc, argv, aArgs) ) if ( !Export::handleArguments(argc, argv, aArgs) )
{ {
Export::writeUsage("uiex","ui"); Export::writeUsage("uiex","*.ui");
return 1; return 1;
} }
sPrj = aArgs.m_sPrj;
sPrjRoot = aArgs.m_sPrjRoot;
sInputFileName = aArgs.m_sInputFile; sInputFileName = aArgs.m_sInputFile;
sOutputFile = aArgs.m_sOutputFile; sOutputFile = aArgs.m_sOutputFile;
if (!aArgs.m_bMergeMode) if (!aArgs.m_bMergeMode)
{ {
if (Export::sLanguages != "en-US") if (aArgs.m_sLanguage != "en-US")
{ {
fprintf(stderr, "only en-US can exist in source .ui files\n"); fprintf(stderr, "only en-US can exist in source .ui files\n");
nRetValue = 1; nRetValue = 1;
@@ -267,7 +262,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
} }
else else
{ {
Merge(aArgs.m_sMergeSrc, sInputFileName, sOutputFile); Merge(aArgs.m_sMergeSrc, sInputFileName, sOutputFile, aArgs.m_sLanguage);
} }
return nRetValue; return nRetValue;

36
l10ntools/source/xrmmerge.cxx
View File

@@ -41,13 +41,12 @@ void YYWarning( const char * );
bool bMergeMode; bool bMergeMode;
sal_Bool bDisplayName; sal_Bool bDisplayName;
sal_Bool bExtensionDescription; sal_Bool bExtensionDescription;
rtl::OString sPrj; OString sLanguage;
rtl::OString sPrjRoot; OString sInputFileName;
rtl::OString sInputFileName; OString sOutputFile;
rtl::OString sOutputFile; OString sMergeSrc;
rtl::OString sMergeSrc; OString sLangAttribute;
rtl::OString sLangAttribute; OString sResourceType;
rtl::OString sResourceType;
XRMResParser *pParser = NULL; XRMResParser *pParser = NULL;
extern "C" { extern "C" {
@@ -65,8 +64,7 @@ extern char *GetOutputFile( int argc, char* argv[])
{ {
// command line is valid // command line is valid
bMergeMode = aArgs.m_bMergeMode; bMergeMode = aArgs.m_bMergeMode;
sPrj = aArgs.m_sPrj; sLanguage = aArgs.m_sLanguage;
sPrjRoot = aArgs.m_sPrjRoot;
sInputFileName = aArgs.m_sInputFile; sInputFileName = aArgs.m_sInputFile;
sOutputFile = aArgs.m_sOutputFile; sOutputFile = aArgs.m_sOutputFile;
sMergeSrc = aArgs.m_sMergeSrc; sMergeSrc = aArgs.m_sMergeSrc;
@@ -77,7 +75,7 @@ extern char *GetOutputFile( int argc, char* argv[])
else else
{ {
// command line is not valid // command line is not valid
Export::writeUsage("xrmex","xrm/xml"); Export::writeUsage("xrmex","*.xrm/*.xml");
return NULL; return NULL;
} }
} }
@@ -88,12 +86,11 @@ int InitXrmExport( char*, char* pFilename)
{ {
// instanciate Export // instanciate Export
rtl::OString sFilename( pFilename ); rtl::OString sFilename( pFilename );
Export::InitLanguages( false );
if ( bMergeMode ) if ( bMergeMode )
pParser = new XRMResMerge( sMergeSrc, sOutputFile, sFilename ); pParser = new XRMResMerge( sMergeSrc, sOutputFile, sFilename );
else if (!sOutputFile.isEmpty()) { else if (!sOutputFile.isEmpty()) {
pParser = new XRMResExport( sOutputFile, sPrj, sInputFileName ); pParser = new XRMResExport( sOutputFile, sInputFileName );
} }
return 1; return 1;
@@ -335,15 +332,13 @@ void XRMResParser::ConvertStringToXMLFormat( rtl::OString &rString )
/*****************************************************************************/ /*****************************************************************************/
XRMResExport::XRMResExport( XRMResExport::XRMResExport(
const rtl::OString &rOutputFile, const rtl::OString &rProject, const OString &rOutputFile, const OString &rFilePath )
const rtl::OString &rFilePath )
/*****************************************************************************/ /*****************************************************************************/
: XRMResParser(), : XRMResParser(),
pResData( NULL ), pResData( NULL ),
sPrj( rProject ),
sPath( rFilePath ) sPath( rFilePath )
{ {
aLanguages = Export::GetLanguages(); aLanguages.push_back( sLanguage );
pOutputStream.open( rOutputFile, PoOfstream::APP ); pOutputStream.open( rOutputFile, PoOfstream::APP );
if (!pOutputStream.isOpen()) if (!pOutputStream.isOpen())
{ {
@@ -441,8 +436,8 @@ void XRMResExport::EndOfText(
/*****************************************************************************/ /*****************************************************************************/
XRMResMerge::XRMResMerge( XRMResMerge::XRMResMerge(
const rtl::OString &rMergeSource, const rtl::OString &rOutputFile, const OString &rMergeSource, const OString &rOutputFile,
const rtl::OString &rFilename) const OString &rFilename )
/*****************************************************************************/ /*****************************************************************************/
: XRMResParser(), : XRMResParser(),
pMergeDataFile( NULL ), pMergeDataFile( NULL ),
@@ -452,13 +447,12 @@ XRMResMerge::XRMResMerge(
if (!rMergeSource.isEmpty()) if (!rMergeSource.isEmpty())
pMergeDataFile = new MergeDataFile( pMergeDataFile = new MergeDataFile(
rMergeSource, sInputFileName, false); rMergeSource, sInputFileName, false);
if( Export::sLanguages.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("ALL"))) if( sLanguage.equalsIgnoreAsciiCase("ALL") )
{ {
Export::SetLanguages( pMergeDataFile->GetLanguages() );
aLanguages = pMergeDataFile->GetLanguages(); aLanguages = pMergeDataFile->GetLanguages();
} }
else else
aLanguages = Export::GetLanguages(); aLanguages.push_back( sLanguage );
pOutputStream.open( pOutputStream.open(
rOutputFile.getStr(), std::ios_base::out | std::ios_base::trunc); rOutputFile.getStr(), std::ios_base::out | std::ios_base::trunc);
if (!pOutputStream.is_open()) { if (!pOutputStream.is_open()) {

1
librelogo/CustomTarget_librelogo.mk
View File

@@ -40,7 +40,6 @@ $(librelogo_DIR)/LibreLogo_%.properties : \
MERGEINPUT=`$(gb_MKTEMP)` && \ MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(POFILE) > $${MERGEINPUT} && \ echo $(POFILE) > $${MERGEINPUT} && \
$(call gb_Executable_get_command,propex) \ $(call gb_Executable_get_command,propex) \
-p librelogo \
-i $(SOURCE) \ -i $(SOURCE) \
-o $@ \ -o $@ \
-m $${MERGEINPUT} \ -m $${MERGEINPUT} \

1
readlicense_oo/CustomTarget_readme.mk
View File

@@ -40,7 +40,6 @@ $(readlicense_oo_DIR)/readme.xrm : \
MERGEINPUT=`$(gb_MKTEMP)` && \ MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(foreach lang,$(filter-out qtz,$(filter-out en-US,$(gb_WITH_LANG))),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po) > $${MERGEINPUT} && \ echo $(foreach lang,$(filter-out qtz,$(filter-out en-US,$(gb_WITH_LANG))),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po) > $${MERGEINPUT} && \
$(call gb_Executable_get_command,xrmex) \ $(call gb_Executable_get_command,xrmex) \
-p readlicense_oo \
-i $< \ -i $< \
-o $@ \ -o $@ \
-m $${MERGEINPUT} \ -m $${MERGEINPUT} \

2
setup_native/CustomTarget_mac.mk
View File

@@ -18,7 +18,7 @@ $(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf: $(SRCDIR)/s
MERGEINPUT=`$(gb_MKTEMP)` && \ MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/setup_native/source/mac.po) > $${MERGEINPUT} && \ echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/setup_native/source/mac.po) > $${MERGEINPUT} && \
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
$(call gb_Executable_get_command,ulfex) -p setup_native -i $< -o $@ -m $${MERGEINPUT} -l all ) && \ $(call gb_Executable_get_command,ulfex) -i $< -o $@ -m $${MERGEINPUT} -l all ) && \
rm -rf $${MERGEINPUT} rm -rf $${MERGEINPUT}
else else
$(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf: $(SRCDIR)/setup_native/source/mac/macinstall.ulf $(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf: $(SRCDIR)/setup_native/source/mac/macinstall.ulf

2
shell/CustomTarget_shlxthdl_res.mk
View File

@@ -54,7 +54,7 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
$(call gb_Executable_get_runtime_dependencies,ulfex) $(call gb_Executable_get_runtime_dependencies,ulfex)
MERGEINPUT=`$(gb_MKTEMP)` && \ MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst $(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \ echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst $(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \
$(call gb_Executable_get_command,ulfex) -p shell -i $< -o $@ -m $${MERGEINPUT} -l all && \ $(call gb_Executable_get_command,ulfex) -i $< -o $@ -m $${MERGEINPUT} -l all && \
rm -f $${MERGEINPUT} rm -f $${MERGEINPUT}
# vim: set shiftwidth=4 tabstop=4 noexpandtab: # vim: set shiftwidth=4 tabstop=4 noexpandtab:

1
solenv/gbuild/AllLangResTarget.mk
View File

@@ -57,7 +57,6 @@ echo $(POFILES) > $${MERGEINPUT} && \
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \ mkdir -p $(dir $(1)) && \
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-p $(firstword $(subst /, ,$(2))) \
-i $(3) \ -i $(3) \
-o $(1) \ -o $(1) \
-m $${MERGEINPUT} \ -m $${MERGEINPUT} \

1
solenv/gbuild/Configuration.mk
View File

@@ -269,7 +269,6 @@ echo $(POFILES) > $${MERGEINPUT} && \
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \ mkdir -p $(dir $(1)) && \
$(gb_XcuMergeTarget_CFGEXCOMMAND) \ $(gb_XcuMergeTarget_CFGEXCOMMAND) \
-p $(firstword $(subst /, ,$(2))) \
-i $(3) \ -i $(3) \
-o $(1) \ -o $(1) \
-m $${MERGEINPUT} \ -m $${MERGEINPUT} \

2
solenv/gbuild/ExtensionTarget.mk
View File

@@ -94,7 +94,6 @@ $(call gb_ExtensionTarget_get_workdir,%)/description.xml : $(gb_ExtensionTarget_
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_ExtensionTarget_get_workdir,$*) && \ mkdir -p $(call gb_ExtensionTarget_get_workdir,$*) && \
$(gb_ExtensionTarget_XRMEXCOMMAND) \ $(gb_ExtensionTarget_XRMEXCOMMAND) \
-p $(PRJNAME) \
-i $(filter %.xml,$^) \ -i $(filter %.xml,$^) \
-o $@ \ -o $@ \
-m $${MERGEINPUT} \ -m $${MERGEINPUT} \
@@ -132,7 +131,6 @@ $(call gb_ExtensionTarget_get_target,$(1)) : FILES := META-INF description.xml
$(call gb_ExtensionTarget_get_target,$(1)) : LICENSE := $(call gb_ExtensionTarget_get_target,$(1)) : LICENSE :=
$(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2) $(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2)
$(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(PLATFORMID) $(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(PLATFORMID)
$(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2)))
$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \ $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \
$(SRCDIR)/$(2)/description.xml $(SRCDIR)/$(2)/description.xml
$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml :| \ $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml :| \

2
solenv/gbuild/InstallModuleTarget.mk
View File

@@ -121,7 +121,7 @@ $(call gb_Output_announce,$(2),$(true),SUM,1)
MERGEINPUT=`$(gb_MKTEMP)` && \ MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(SCP_POFILES) > $${MERGEINPUT} && \ echo $(SCP_POFILES) > $${MERGEINPUT} && \
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
$(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(SCP_SOURCE) -o $(1) -m $${MERGEINPUT} -l all ) && \ $(gb_ScpMergeTarget_COMMAND) -i $(SCP_SOURCE) -o $(1) -m $${MERGEINPUT} -l all ) && \
rm -rf $${MERGEINPUT} rm -rf $${MERGEINPUT}
endef endef

2
sysui/CustomTarget_share.mk
View File

@@ -217,7 +217,7 @@ $(share_WORKDIR)/%.ulf: $(share_SRCDIR)/share/%.ulf | $(call gb_Executable_get_r
MERGEINPUT=`$(gb_MKTEMP)` && \ MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $@)).po) > $${MERGEINPUT} && \ echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $@)).po) > $${MERGEINPUT} && \
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
$(call gb_Executable_get_command,ulfex) -p sysui -i $< -o $@ -m $${MERGEINPUT} -l all ) && \ $(call gb_Executable_get_command,ulfex) -i $< -o $@ -m $${MERGEINPUT} -l all ) && \
rm -rf $${MERGEINPUT} rm -rf $${MERGEINPUT}
else else
$(share_WORKDIR)/%.ulf: $(share_SRCDIR)/share/%.ulf $(share_WORKDIR)/%.ulf: $(share_SRCDIR)/share/%.ulf