View | Details | Raw Unified | Return to issue 83702
Collapse All | Expand All

(-)source/config/tools/merge/pyAltFCFGMerge (-14 / +30 lines)
Lines 38-43 Link Here
38
PROP_FCFG            = "fcfg"                     # // <= cmdline
38
PROP_FCFG            = "fcfg"                     # // <= cmdline
39
PROP_LCFG            = "lcfg"                     # // <= cmdline
39
PROP_LCFG            = "lcfg"                     # // <= cmdline
40
PROP_CCFG            = "ccfg"                     # // <= cmdline
40
PROP_CCFG            = "ccfg"                     # // <= cmdline
41
PROP_LANGUAGEPACK    = "languagepack"             # // <= cmdline
41
PROP_ITEMS           = "items"                    # // <= pkg cfg files!
42
PROP_ITEMS           = "items"                    # // <= pkg cfg files!
42
43
43
#---begin java.util.Properties copy---#
44
#---begin java.util.Properties copy---#
Lines 396-401 Link Here
396
                "does not exists!");
397
                "does not exists!");
397
        return self.props[sProp];
398
        return self.props[sProp];
398
399
400
    def getValueWithDefault(self, sProp, default):
401
        if not self.props.has_key(sProp):
402
		return default;
403
        return self.props[sProp];
404
399
    def getStringList(self, sProp, sDelimiter, bTrim, bDecode):
405
    def getStringList(self, sProp, sDelimiter, bTrim, bDecode):
400
        if not self.props.has_key(sProp):
406
        if not self.props.has_key(sProp):
401
            raise Exception("The requested config value \""+sProp+"\" does "\
407
            raise Exception("The requested config value \""+sProp+"\" does "\
Lines 415-434 Link Here
415
421
416
        return lValue
422
        return lValue
417
423
418
def generateHeader(sVersion, sEncoding, sPath, sPackage):
424
def generateHeader(sVersion, sEncoding, sPath, sPackage, bLanguagePack):
419
    sHeader = "<?xml version=\""
425
    sHeader = "<?xml version=\""
420
    sHeader = sHeader + sVersion
426
    sHeader += sVersion
421
    sHeader = sHeader + "\" encoding=\""
427
    sHeader += "\" encoding=\""
422
    sHeader = sHeader + sEncoding
428
    sHeader += sEncoding
423
    sHeader = sHeader + "\"?>\n<!DOCTYPE oor:component-data SYSTEM \"../"
429
    sHeader += "\"?>\n"
424
    sHeader = sHeader + "../../../component-update.dtd\">\n"
430
425
    sHeader = sHeader + "<oor:component-data xmlns:oor=\""
431
    if bLanguagePack:
426
    sHeader = sHeader + "http://openoffice.org/2001/registry\" xmlns:xs=\"http"
432
        sHeader += "<oor:component-data oor:package=\""
427
    sHeader = sHeader + "://www.w3.org/2001/XMLSchema\" oor:package=\""
433
        sHeader += sPath
428
    sHeader = sHeader + sPath
434
        sHeader += "\" oor:name=\""
429
    sHeader = sHeader + "\" oor:name=\""
435
        sHeader += sPackage
430
    sHeader = sHeader + sPackage
436
        sHeader += "\" xmlns:install=\"http://openoffice.org/2004/installation\""
431
    sHeader = sHeader + "\">\n"
437
        sHeader += " xmlns:oor=\"http://openoffice.org/2001/registry\""
438
        sHeader += " xmlns:xs=\"http://www.w3.org/2001/XMLSchema\""
439
        sHeader += " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n"
440
    else:
441
        sHeader += "<!DOCTYPE oor:component-data SYSTEM \"../../../../component-update.dtd\">\n"
442
        sHeader += "<oor:component-data xmlns:oor=\"http://openoffice.org/2001/registry\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" oor:package=\""
443
        sHeader += sPath
444
        sHeader += "\" oor:name=\""
445
        sHeader += sPackage
446
        sHeader += "\">\n"
432
    return sHeader
447
    return sHeader
433
448
434
def generateFooter():
449
def generateFooter():
Lines 482-488 Link Here
482
                self.m_aCfg.getValue(PROP_XMLVERSION ),\
497
                self.m_aCfg.getValue(PROP_XMLVERSION ),\
483
                self.m_aCfg.getValue(PROP_XMLENCODING),\
498
                self.m_aCfg.getValue(PROP_XMLENCODING),\
484
                self.m_aCfg.getValue(PROP_XMLPATH    ),\
499
                self.m_aCfg.getValue(PROP_XMLPATH    ),\
485
                self.m_aCfg.getValue(PROP_XMLPACKAGE ))
500
                self.m_aCfg.getValue(PROP_XMLPACKAGE ),\
501
                self.m_aCfg.getValueWithDefault(PROP_LANGUAGEPACK, False))
486
502
487
        # counts all transfered fragments
503
        # counts all transfered fragments
488
        # Can be used later to decide, if a generated package file
504
        # Can be used later to decide, if a generated package file

Return to issue 83702