Index: make.py ================================================================== --- make.py +++ make.py @@ -157,11 +157,11 @@ hDst.write("# " + dOptData["dOptLabel"][sLang].get(sOpt, "[no label found]")[0] + "\n") hDst.write(sOpt + " = " + ("1" if dOptData["dOptServer"].get(sOpt, None) else "0") + "\n") hDst.write("html = 1\n") -def createPackageZip (sLang, dVars, spLangPack): +def createPackageZip (dVars, spLangPack): "create server zip" spfZip = "_build/" + dVars['name'] + "-"+ dVars['lang'] +"-v" + dVars['version'] + '.zip' hZip = zipfile.ZipFile(spfZip, mode='w', compression=zipfile.ZIP_DEFLATED) copyGrammalectePyPackageInZipFile(hZip, spLangPack) for spf in ["grammalecte-cli.py", "grammalecte-server.py", \ @@ -195,11 +195,11 @@ print("> read configuration...") spLang = "gc_lang/" + sLang dVars = xConfig._sections['args'] dVars['locales'] = dVars["locales"].replace("_", "-") - dVars['loc'] = str(dict([ [s, [s[0:2], s[3:5], ""]] for s in dVars["locales"].split(" ") ])) + dVars['loc'] = str({ s: [s[0:2], s[3:5], ""] for s in dVars["locales"].split(" ") }) ## COMPILE RULES dResult = compile_rules.make(spLang, dVars['lang'], bUseCache) dVars.update(dResult) @@ -240,11 +240,11 @@ hDstPy.write(dVars['gctests']) hDstPy.write("\n") createOXT(spLang, dVars, xConfig._sections['oxt'], spLangPack, bInstallOXT) - createPackageZip(sLang, dVars, spLangPack) + createPackageZip(dVars, spLangPack) #### JAVASCRIPT if bJavaScript: print("JAVASCRIPT:") print("+ Plugins: ", end="") @@ -449,16 +449,10 @@ unittest.TextTestRunner().run(xTestSuite) if xArgs.perf or xArgs.perf_memo: hDst = open("./gc_lang/"+sLang+"/perf_memo.txt", "a", encoding="utf-8", newline="\n") if xArgs.perf_memo else None tests.perf(sVersion, hDst) - # Firefox (obsolete) - #if False: - # with helpers.CD("_build/xpi/"+sLang): - # spfFirefox = dVars['win_fx_dev_path'] if platform.system() == "Windows" else dVars['linux_fx_dev_path'] - # os.system('jpm run -b "' + spfFirefox + '"') - if xArgs.web_ext or xArgs.firefox: with helpers.CD("_build/webext/"+sLang): if xArgs.lint_web_ext: os.system(r'web-ext lint -o text') if xArgs.firefox: