Changeset 5655

Show
Ignore:
Timestamp:
08/08/12 05:06:25 (7 years ago)
Author:
albert
Message:

Reverting r 5654 -- it included a number of changes I did not want to commit, sorry.

Location:
seattle/trunk
Files:
18 modified

Legend:

Unmodified
Added
Removed
  • seattle/trunk/custominstallerbuilder/common/constants.py

    r5654 r5655  
    1818 
    1919# The complete set of platforms supported by the Custom Installler Builder. 
    20 PLATFORMS = set(['linux', 'mac', 'windows', 'android']) 
     20PLATFORMS = set(['linux', 'mac', 'windows']) 
    2121 
    2222# For each platform listed above, it should belong to one of the following 
     
    2424TGZ_PLATFORMS = set(['linux', 'mac']) 
    2525ZIP_PLATFORMS = set(['windows']) 
    26 APK_PLATFORMS = set(['android']) 
    2726 
    2827# For each platform listed above, provide the name of the base installer 
     
    3231  'mac': 'seattle_mac.tgz', 
    3332  'windows': 'seattle_win.zip', 
    34   'android': 'seattle_android.apk', 
    3533} 
    3634 
     
    6967FILE_PERMISSIONS = 0644 
    7068DIR_PERMISSIONS = 0755 
    71  
  • seattle/trunk/custominstallerbuilder/common/packager.py

    r5654 r5655  
    130130    os.remove(temp) 
    131131    os.chmod(orig, constants.FILE_PERMISSIONS) 
    132  
    133   for platform in (constants.APK_PLATFORMS & set(build_platforms)): 
    134     orig = base_installers[platform] 
    135     align = base_installers[platform] + '.align' 
    136  
    137     # Modify seattle.zip 
    138     subprocess.call(['unzip', orig, 'res/raw/seattle.zip'], cwd=working_dir) 
    139     subprocess.call(['zip', '-r', './res/raw/seattle.zip', config_dir_rel], cwd=working_dir) 
    140     subprocess.call(['zip', '-r', orig, './res'], cwd=working_dir) 
    141     # Sign and align the apk 
    142     subprocess.call(['jarsigner', '-digestalg', 'SHA1', '-sigfile', 'CERT',  
    143                      '-keystore', settings.ANDR_KEYSTORE_PATH, '-storepass', 
    144                      settings.ANDR_KEYSTORE_PASS, '-keypass', settings.ANDR_KEY_PASS, 
    145                      orig, settings.ANDR_KEY_NAME], cwd=working_dir) 
    146     subprocess.call(['zipalign', '4', orig, align], cwd=working_dir) 
    147     os.remove(orig) 
    148     shutil.move(align, orig) 
    149  
    150     shutil.rmtree(os.path.abspath(os.path.join(working_dir, 'res'))) 
    151132 
    152133  # Remove the working directories. 
  • seattle/trunk/custominstallerbuilder/html/templates/download_installers.html

    r5654 r5655  
    6969      </td>  
    7070    </tr> 
    71     <tr id="android">  
    72       <td><a href="{{ installers.android }}"><img src="{{ MEDIA_URL }}/img/android.png" alt="android" /></a><br /><a class="button" href="{{ installers.android }}">Download installer<br />for Android</a></td>  
    73       <td> 
    74         <p><strong>Android instructions</strong></p> 
    75          
    76         <ol>  
    77           <li>Download and install the APK on your handset.</li>  
    78           <li>Start the app and follow the on-screen instruction.</li>  
    79         </ol> 
    80          
    81         <p>Note: Your device must have Android 2.1 or newer installed.</p> 
    82       </td> 
    83     </tr> 
    8471  </table> 
    8572   
  • seattle/trunk/custominstallerbuilder/local_template/settings.py

    r5654 r5655  
    4646# The locations of the customized installers created by this program. 
    4747CUSTOM_INSTALLER_URL = PROJECT_URL + 'static/installers/' 
    48  
    49 # Location of the keystore. Change this in your local install 
    50 ANDR_KEYSTORE_PATH = 'path/to/keystore' 
    51  
    52 # Keystore password. Change this in your local install 
    53 ANDR_KEYSTORE_PASS = 'keystore-password' 
    54  
    55 # Key password. Change this in your local install 
    56 ANDR_KEY_PASS = 'key-password' 
    57  
    58 # Key name. Change this in your local install 
    59 ANDR_KEY_NAME = 'key-name' 
  • seattle/trunk/custominstallerbuilder/settings_base.py

    r5654 r5655  
    131131SERVE_STATIC = False 
    132132STATIC_BASE = 'static/' 
    133  
    134 # Android keystore settings 
    135 ANDR_KEYSTORE_PATH = '' 
    136 ANDR_KEYSTORE_PASS = '' 
    137 ANDR_KEY_PASS = '' 
    138 ANDR_KEY_NAME = '' 
  • seattle/trunk/nodemanager/nmAPI.mix

    r5654 r5655  
    6969# import for Popen 
    7070import portable_popen 
    71  
    72 # Fix for #1081, use sys.executable instead of "python" 
    73 import sys 
    74  
    75  
    76  
    7771 
    7872offcutfilename = "resources.offcut" 
  • seattle/trunk/oddball/tests/ut_oddball_stop.2.py

    r5654 r5655  
    11import utfutil 
    2 import utf 
    3  
    4  
    52 
    63def main(): 
     
    129               ] 
    1310 
    14   (rawout, error) = utfutil.execute_repy(repy_args) 
    15  
    16   out = utf.strip_android_debug_messages(rawout) 
    17  
     11  output = (out, error) = utfutil.execute_repy(repy_args) 
    1812  if not error or out: print 'FAIL' 
    1913 
  • seattle/trunk/oddball/tests/ut_oddball_sub.py

    r5654 r5655  
    11import os 
    2 import utf 
     2 
    33import utfutil 
    44 
     
    1616              ] 
    1717 
    18   (rawout, error) = utfutil.execute_repy(repy_args) 
    19  
    20   out = utf.strip_android_debug_messages(rawout) 
     18  (out, error) = utfutil.execute_repy(repy_args) 
    2119 
    2220  if out or error: print 'FAIL' 
  • seattle/trunk/repy/tests/ut_repytests_testclose.py

    r5654 r5655  
    22import time 
    33import sys 
    4 import utf 
    54 
    65processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testclose.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    7 (rawstdoutFirst, stderrFirst) = processOne.communicate() 
     6(stdoutFirst, stderrFirst) = processOne.communicate() 
    87processOne.wait() 
    98processTwo = subprocess.Popen([sys.executable, 's_testclose.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    10 (rawstdoutSecond, stderrSecond) = processTwo.communicate() 
     9(stdoutSecond, stderrSecond) = processTwo.communicate() 
    1110processTwo.wait() 
    12  
    13 stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
    14 stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1511 
    1612if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testfileinit.py

    r5654 r5655  
    22import time 
    33import sys 
    4 import utf 
    54 
    65processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testfileinit.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    7 (rawstdoutFirst, stderrFirst) = processOne.communicate() 
     6(stdoutFirst, stderrFirst) = processOne.communicate() 
    87processOne.wait() 
    98processTwo = subprocess.Popen([sys.executable, 's_testfileinit.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    10 (rawstdoutSecond, stderrSecond) = processTwo.communicate() 
     9(stdoutSecond, stderrSecond) = processTwo.communicate() 
    1110processTwo.wait() 
    12  
    13 stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
    14 stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1511 
    1612if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testflush.py

    r5654 r5655  
    22import time 
    33import sys 
    4 import utf 
    54 
    65processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testflush.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    7 (rawstdoutFirst, stderrFirst) = processOne.communicate() 
     6(stdoutFirst, stderrFirst) = processOne.communicate() 
    87processOne.wait() 
    98processTwo = subprocess.Popen([sys.executable, 's_testflush.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    10 (rawstdoutSecond, stderrSecond) = processTwo.communicate() 
     9(stdoutSecond, stderrSecond) = processTwo.communicate() 
    1110processTwo.wait() 
    12  
    13 stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
    14 stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1511 
    1612if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testnext.py

    r5654 r5655  
    22import time 
    33import sys 
    4 import utf 
    54 
    65processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testnext.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    7 (rawstdoutFirst, stderrFirst) = processOne.communicate() 
     6(stdoutFirst, stderrFirst) = processOne.communicate() 
    87processOne.wait() 
    98processTwo = subprocess.Popen([sys.executable, 's_testnext.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    10 (rawstdoutSecond, stderrSecond) = processTwo.communicate() 
     9(stdoutSecond, stderrSecond) = processTwo.communicate() 
    1110processTwo.wait() 
    12  
    13 stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
    14 stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1511 
    1612if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testopen.py

    r5654 r5655  
    22import time 
    33import sys 
    4 import utf 
    54 
    65processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testopen.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    7 (rawstdoutFirst, stderrFirst) = processOne.communicate() 
     6(stdoutFirst, stderrFirst) = processOne.communicate() 
    87processOne.wait() 
    98processTwo = subprocess.Popen([sys.executable, 's_testopen.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    10 (rawstdoutSecond, stderrSecond) = processTwo.communicate() 
     9(stdoutSecond, stderrSecond) = processTwo.communicate() 
    1110processTwo.wait() 
    12  
    13 stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
    14 stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1511 
    1612if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testread.py

    r5654 r5655  
    22import time 
    33import sys 
    4 import utf 
    54 
    65processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testread.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    7 (rawstdoutFirst, stderrFirst) = processOne.communicate() 
     6(stdoutFirst, stderrFirst) = processOne.communicate() 
    87processOne.wait() 
    98processTwo = subprocess.Popen([sys.executable, 's_testread.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    10 (rawstdoutSecond, stderrSecond) = processTwo.communicate() 
     9(stdoutSecond, stderrSecond) = processTwo.communicate() 
    1110processTwo.wait() 
    12  
    13 stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
    14 stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1511 
    1612if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testreadline.py

    r5654 r5655  
    11import subprocess 
    22import time 
     3 
    34import sys 
    4 import utf 
    55 
    66processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testreadline.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    7 (rawstdoutFirst, stderrFirst) = processOne.communicate() 
     7(stdoutFirst, stderrFirst) = processOne.communicate() 
    88processOne.wait() 
    99processTwo = subprocess.Popen([sys.executable, 's_testreadline.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    10 (rawstdoutSecond, stderrSecond) = processTwo.communicate() 
     10(stdoutSecond, stderrSecond) = processTwo.communicate() 
    1111processTwo.wait() 
    12  
    13 stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
    14 stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1512 
    1613if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testreadlines.py

    r5654 r5655  
    22import time 
    33import sys 
    4 import utf 
    54 
    65processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testreadlines.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    7 (rawstdoutFirst, stderrFirst) = processOne.communicate() 
     6(stdoutFirst, stderrFirst) = processOne.communicate() 
    87processOne.wait() 
    98processTwo = subprocess.Popen([sys.executable, 's_testreadlines.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    10 (rawstdoutSecond, stderrSecond) = processTwo.communicate() 
     9(stdoutSecond, stderrSecond) = processTwo.communicate() 
    1110processTwo.wait() 
    12  
    13 stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
    14 stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1511 
    1612if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testseek.py

    r5654 r5655  
    22import time 
    33import sys 
    4 import utf 
    54 
    65processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testseek.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    7 (rawstdoutFirst, stderrFirst) = processOne.communicate() 
     6(stdoutFirst, stderrFirst) = processOne.communicate() 
    87processOne.wait() 
    98processTwo = subprocess.Popen([sys.executable, 's_testseek.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    10 (rawstdoutSecond, stderrSecond) = processTwo.communicate() 
     9(stdoutSecond, stderrSecond) = processTwo.communicate() 
    1110processTwo.wait() 
    1211 
    13 stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
    14 stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1512 
    1613if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: 
  • seattle/trunk/repy/tests/ut_repytests_testwrite2.py

    r5654 r5655  
    22import time 
    33import sys 
    4 import utf 
    54 
    65processOne = subprocess.Popen([sys.executable, 'repy.py', '--simple', 'restrictions.default', 's_testwrite2.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    7 (rawstdoutFirst, stderrFirst) = processOne.communicate() 
     6(stdoutFirst, stderrFirst) = processOne.communicate() 
    87processOne.wait() 
    98processTwo = subprocess.Popen([sys.executable, 's_testwrite2.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
    10 (rawstdoutSecond, stderrSecond) = processTwo.communicate() 
     9(stdoutSecond, stderrSecond) = processTwo.communicate() 
    1110processTwo.wait() 
    12  
    13 stdoutFirst = utf.strip_android_debug_messages(rawstdoutFirst) 
    14 stdoutSecond = utf.strip_android_debug_messages(rawstdoutSecond) 
    1511 
    1612if stderrFirst != stderrSecond or stdoutFirst != stdoutSecond: