Skip to content

Commit 3f160dd

Browse files
author
sreeder
committed
remove invalid debug statement, update make file
1 parent 61a9264 commit 3f160dd

File tree

6 files changed

+8
-86
lines changed

6 files changed

+8
-86
lines changed

make.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ def run_pyinstaller(console=False):
157157
'--upx-dir=%s ' % BASE_DIR +
158158
'--icon=%s ' % WIN_ICON_FILE +
159159
'--version-file=%s ' % VERSION_FILE +
160+
# '--onefile '
160161
'--noconfirm ' + APP_FILE)
161162
else:
162163
## Non Console Version
@@ -167,6 +168,7 @@ def run_pyinstaller(console=False):
167168
'--specpath=%s ' % WIN_DIR +
168169
'--upx-dir=%s ' % BASE_DIR +
169170
'--icon=%s ' % WIN_ICON_FILE +
171+
# '--onefile '
170172
'--version-file=%s ' % VERSION_FILE +
171173
'--noconsole '
172174
'--noconfirm ' + APP_FILE)
@@ -186,15 +188,12 @@ def mac_pyinstaller():
186188
'--upx-dir=%s ' % BASE_DIR +
187189
'--icon=%s ' % MAC_ICON_FILE +
188190
'--version-file=%s ' % VERSION_FILE +
189-
'--windowed '
190-
#'--onefile '
191-
#'--hidden-import="libwx_osx_cocoau-3.0.0.0.0.dylib" '
191+
'--windowed '#'--onefile '
192192
'--noconfirm ' + APP_FILE)
193193

194-
195-
os.system("cp /anaconda/envs/odmtools/lib/libwx_osx_cocoau-3.0.0.0.0.dylib %s" % os.path.join(APP_DIR, "Contents/MacOS/"))
196-
# os.system("cp /anaconda/envs/odmtools/lib/libwx_osx_cocoau-3.0.0.0.0.dylib %s" % os.path.join(APP_DIR, "Contents/MacOS/"))
197194
#copy "libwx_osx_cocoau-3.0.0.0.0.dylib"
195+
os.system("cp /anaconda/envs/odmtools/lib/libwx_osx_cocoau-3.0.0.0.0.dylib %s" % os.path.join(APP_DIR, "Contents/MacOS/"))
196+
198197
return True
199198
except Exception as e:
200199
print (e)

odmtools/gui/plotHistogram.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def _createPlot(self, oneSeries, rows, cols, index):
101101
ax = self.figure.add_subplot(repr(rows) + repr(cols) + repr(index))
102102

103103
logger.debug("HISTOGRAM: %s"% ax)
104-
logger.debut("rows: %s cols: %s, index: %s"%(rows, cols, index))
104+
#logger.debut("rows: %s cols: %s, index: %s"%(rows, cols, index))
105105

106106
# oneSeries.filteredData.hist(ax= ax, color='k', alpha=0.5, bins=50)
107107

psycopg2/bld.bat

Lines changed: 0 additions & 8 deletions
This file was deleted.

psycopg2/build.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

psycopg2/meta.yaml

Lines changed: 0 additions & 60 deletions
This file was deleted.

setup/Windows/odmtools_console.iss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
3939
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
4040

4141
[Files]
42-
Source: "{#MyAppDir}\setup\Windows\ODMTools\ODMTools.exe"; DestDir: "{app}"; Flags: ignoreversion
43-
Source: "{#MyAppDir}\setup\Windows\ODMTools\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
42+
Source: "{#MyAppDir}\setup\Windows\ODMTools.exe"; DestDir: "{app}"; Flags: ignoreversion
43+
Source: "{#MyAppDir}\setup\Windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
4444
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
4545

4646
[Icons]

0 commit comments

Comments
 (0)