diff --git a/.travis.yml b/.travis.yml index 46480f464..52599fcdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,11 +64,10 @@ install: - python2 -m pip install pyjavaproperties - python2 -m pip install github3.py - python2 -m pip install cpp-coveralls +- python2 -m pip install certifi -- ls /usr/local/lib/python2.7/site-packages/ -- ls /usr/local/lib/python2.7/site-packages/requests/ -- ls /usr/local/lib/python2.7/site-packages/requests/cacert.pem - locate cacert.pem +- ls /usr/local/lib/python2.7/dist-packages/certifi/cacert.pem before_script: - export REQUESTS_CA_BUNDLE=/usr/local/lib/python2.7/dist-packages/certifi/cacert.pem diff --git a/projects/mtg/bin/Res/createResourceZip.py b/projects/mtg/bin/Res/createResourceZip.py index 600c3dc01..1ddcb9b51 100644 --- a/projects/mtg/bin/Res/createResourceZip.py +++ b/projects/mtg/bin/Res/createResourceZip.py @@ -49,7 +49,8 @@ def createStandardResFile(filename): if not filename: filename = getFilename() + '.zip' createResZipFile( filename ) - print('Created Resource Package for Standard Distribution: {0}'.format(filename), file=sys.stderr) + #print('Created Resource Package for Standard Distribution: {0}'.format(filename), file=sys.stderr) + print >> sys.stderr, 'Created Resource Package for Standard Distribution: {0}'.format( filename) def createIosResFile(filename): print('Preparing Resource Package for iOS') @@ -61,7 +62,8 @@ def createIosResFile(filename): zip_file.write("../../iOS/Res/rules/modrules.xml", "rules/modrules.xml", zipfile.ZIP_STORED) zip_file.close() - print('Created Resource Package for Standard Distribution: {0}'.format(filename), file=sys.stderr) + #print('Created Resource Package for Standard Distribution: {0}'.format(filename), file=sys.stderr) + print >> sys.stderr, 'Created Resource Package for iOS Distribution: {0}'.format( filename) class ZipUtilities: diff --git a/projects/mtg/bin/createWindowsZip.py b/projects/mtg/bin/createWindowsZip.py index 0a8b851f1..7308ca7d7 100644 --- a/projects/mtg/bin/createWindowsZip.py +++ b/projects/mtg/bin/createWindowsZip.py @@ -26,12 +26,14 @@ def getFilename(filename): return filename def createStandardResFile(): - print("Creating Resource File") + #print("Creating Resource File") + print "Creating Resource File" cmd = 'python createResourceZip.py -n ' + getFilename('core') + '.zip' os.chdir("Res") os.system(cmd) os.chdir("..") - print("Creating Windows Package File") + #print("Creating Windows Package File") + print "Creating Windows Package File" filename = 'Wagic-windows.zip' createWindowsZipFile( filename ) #print(sys.stderr, 'Created Windows Package: {0}'.format( filename))