Grammalecte  Check-in [7ba08610f3]

Overview
Comment:[build] paths for Firefox on Windows and on Linux
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | build | webext2
Files: files | file ages | folders
SHA3-256: 7ba08610f3c165b6fe8b4ec708f023896beec08e245617e6764d2ce595683961
User & Date: olr on 2017-08-06 13:40:25
Other Links: branch diff | manifest | tags
Context
2017-08-06
20:54
[fx][fr][bug] conj: initialisation incorrecte pour les content-scripts check-in: 2e0c8273f1 user: olr tags: fx, webext2
13:40
[build] paths for Firefox on Windows and on Linux check-in: 7ba08610f3 user: olr tags: build, webext2
13:27
[build] don’t use Firefox nightly for Addon-SDK tests -> developper edition check-in: 97544c27f2 user: olr tags: build, webext2
Changes

Modified gc_lang/fr/config.ini from [1617a5f4ba] to [4666c13388].

    27     27   oxt_version = 6.2
    28     28   oxt_identifier = French.linguistic.resources.from.Dicollecte.by.OlivierR
    29     29   
    30     30   # Firefox
    31     31   fx_identifier = French-GC@grammalecte.net
    32     32   fx_name = Grammalecte [fr]
    33     33   
    34         -fx_standard_path = C:\Program Files\Mozilla Firefox\firefox.exe
    35         -fx_dev_path = C:\Program Files\Firefox Developer Edition\firefox.exe
    36         -fx_nightly_path = C:\Program Files (x86)\Nightly\firefox.exe
           34  +win_fx_dev_path = C:\Program Files\Firefox Developer Edition\firefox.exe
           35  +win_fx_nightly_path = C:\Program Files (x86)\Nightly\firefox.exe
           36  +linux_fx_dev_path = /usr/bin/firefox
           37  +linux_fx_nightly_path = /usr/bin/firefox
    37     38   
    38     39   
    39     40   # Thunderbird
    40     41   tb_identifier = French-GC-TB@grammalecte.net
    41     42   tb_name = Grammalecte [fr]
    42     43   tb_debug_extension_path = _build/tb-debug.profile/extensions/French-GC-TB@grammalecte.net
    43     44   # Set Thunderbird folder in your PATH variable

Modified make.py from [d0e8712740] to [48fa32607c].

     9      9   import traceback
    10     10   import configparser
    11     11   import datetime
    12     12   import argparse
    13     13   import importlib
    14     14   import unittest
    15     15   import json
           16  +import platform
    16     17   
    17     18   from distutils import dir_util, file_util
    18     19   
    19     20   import dialog_bundled
    20     21   import compile_rules
    21     22   import helpers
    22     23   
................................................................................
   346    347                       if xArgs.perf or xArgs.perf_memo:
   347    348                           hDst = open("./gc_lang/"+sLang+"/perf_memo.txt", "a", encoding="utf-8", newline="\n")  if xArgs.perf_memo  else None
   348    349                           tests.perf(sVersion, hDst)
   349    350   
   350    351               # Firefox
   351    352               if xArgs.firefox:
   352    353                   with helpers.cd("_build/xpi/"+sLang):
   353         -                    os.system('jpm run -b "' + dVars['fx_dev_path'] + '"')
          354  +                    spfFirefox = dVars['win_fx_dev_path']  if platform.system() == "Windows"  else dVars['linux_fx_dev_path']
          355  +                    os.system('jpm run -b "' + spfFirefox + '"')
   354    356   
   355    357               if xArgs.web_ext:
   356    358                   with helpers.cd("_build/webext/"+sLang):
   357         -                    os.system(r'web-ext run --firefox="' + dVars['fx_nightly_path'] + '" --browser-console')            
          359  +                    spfFirefox = dVars['win_fx_nightly_path']  if platform.system() == "Windows"  else dVars['linux_fx_nightly_path']
          360  +                    os.system(r'web-ext run --firefox="' + spfFirefox + '" --browser-console')            
   358    361   
   359    362               # Thunderbird
   360    363               if xArgs.thunderbird:
   361    364                   os.system("thunderbird -jsconsole -P debug")
   362    365           else:
   363    366               print("Folder not found: gc_lang/"+sLang)
   364    367   
   365    368   
   366    369   if __name__ == '__main__':
   367    370       main()