Grammalecte  Check-in [7ee6b583e8]

Overview
Comment:merge trunk
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | multid
Files: files | file ages | folders
SHA3-256: 7ee6b583e89ef8cc6dc2a6d5563309f8139a2bbd9f6c25fa760be53fb5194e71
User & Date: olr on 2018-03-06 11:34:05
Other Links: branch diff | manifest | tags
Context
2018-03-06
15:08
[tb] lexicon editor: Ui update check-in: f077da7669 user: olr tags: multid, tb
11:34
merge trunk check-in: 7ee6b583e8 user: olr tags: multid
11:33
[build][tb] move the Thunberbird debug profile somewhere else check-in: d7e8aec548 user: olr tags: build, tb, trunk
2018-03-05
18:15
merge trunk check-in: c0e7e2c228 user: olr tags: multid
Changes

Modified gc_lang/fr/build.py from [ea0f7f998e] to [9ca6336e46].

     1      1   # Builder for French language
     2      2   
     3      3   import os
            4  +import platform
     4      5   import zipfile
     5      6   from distutils import dir_util, file_util
     6      7   
     7      8   import helpers
     8      9   
     9     10   
    10     11   def build (sLang, dVars, spLangPack):
................................................................................
    86     87       helpers.addFolderToZipAndFileFile(hZip, "gc_lang/"+sLang+"/tb", "", dVars, True)
    87     88       spDict = "gc_lang/"+sLang+"/xpi/data/dictionaries"
    88     89       for sp in os.listdir(spDict):
    89     90           if os.path.isdir(spDict+"/"+sp):
    90     91               hZip.write(spDict+"/"+sp+"/"+sp+".dic", "content/dictionaries/"+sp+"/"+sp+".dic")
    91     92               hZip.write(spDict+"/"+sp+"/"+sp+".aff", "content/dictionaries/"+sp+"/"+sp+".aff")
    92     93       hZip.close()
    93         -    helpers.unzip(spfZip, dVars['tb_debug_extension_path'])
           94  +    spfDebugProfile = dVars['win_tb_debug_extension_path']  if platform.system() == "Windows"  else dVars['linux_tb_debug_extension_path']
           95  +    helpers.unzip(spfZip, spfDebugProfile)
    94     96   
    95     97   
    96     98   def _createOptionsForThunderbird (dVars):
    97     99       dVars['sXULTabs'] = ""
    98    100       dVars['sXULTabPanels'] = ""
    99    101       # dialog options
   100    102       for sSection, lOpt in dVars['lStructOpt']:

Modified gc_lang/fr/config.ini from [458dbb3023] to [4a9c6e6781].

    41     41   fx_name = Grammalecte [fr]
    42     42   
    43     43   win_fx_dev_path = C:\Program Files\Firefox Developer Edition\firefox.exe
    44     44   win_fx_nightly_path = C:\Program Files\Nightly\firefox.exe
    45     45   linux_fx_dev_path = /usr/bin/firefox
    46     46   linux_fx_nightly_path = /usr/bin/firefox
    47     47   
    48         -
    49     48   # Thunderbird
    50     49   tb_identifier = French-GC-TB@grammalecte.net
    51     50   tb_name = Grammalecte [fr]
    52         -tb_debug_extension_path = _build/tb-debug.profile/extensions/French-GC-TB@grammalecte.net
           51  +win_tb_debug_extension_path = D:\_temp\tb-debug.profile\extensions\French-GC-TB@grammalecte.net
           52  +linux_tb_debug_extension_path = ~/tb-debug.profile/extensions/French-GC-TB@grammalecte.net
    53     53   # Set Thunderbird folder in your PATH variable
    54     54   # Create a local profile:
    55     55   #     	thunderbird -CreateProfile "debug _build\tb-debug.profile"
    56     56   # Or you can use the GUI with:
    57     57   #	 	thunderbird -P
    58     58   # To launch Thunderbird with the profile debug, type:
    59     59   #     	thunderbird -P debug