Skip to content

Commit 9f7ff39

Browse files
author
stephanie
committed
Merge branch 'development'
2 parents 4d2fa75 + cf43e32 commit 9f7ff39

File tree

6 files changed

+73
-10
lines changed

6 files changed

+73
-10
lines changed

‎setup/Mac/sdl_setup.packproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@
7575
<key>GID</key>
7676
<integer>80</integer>
7777
<key>Path</key>
78-
<string>../../src/dist/StreamingDataLoader</string>
78+
<string>/Users/stephanie/DEV/StreamingDataLoader/setup/Mac/StreamingDataLoader</string>
7979
<key>Path Type</key>
80-
<integer>2</integer>
80+
<integer>1</integer>
8181
<key>Privileges</key>
8282
<integer>493</integer>
8383
<key>Type</key>
@@ -91,9 +91,9 @@
9191
<key>GID</key>
9292
<integer>80</integer>
9393
<key>Path</key>
94-
<string>../../src/dist/StreamingDataLoaderWizard</string>
94+
<string>/Users/stephanie/DEV/StreamingDataLoader/setup/Mac/StreamingDataLoaderWizard.app</string>
9595
<key>Path Type</key>
96-
<integer>2</integer>
96+
<integer>1</integer>
9797
<key>Privileges</key>
9898
<integer>493</integer>
9999
<key>Type</key>
@@ -495,9 +495,9 @@
495495
<key>IFPkgDescriptionDescription</key>
496496
<string></string>
497497
<key>IFPkgDescriptionTitle</key>
498-
<string>StreamingDataLoader_v0.6</string>
498+
<string>StreamingDataLoader_v0.7</string>
499499
<key>IFPkgDescriptionVersion</key>
500-
<string>0.6 Beta</string>
500+
<string>0.7 Beta</string>
501501
</dict>
502502
</dict>
503503
<key>Display Information</key>
@@ -513,7 +513,7 @@
513513
<key>CFBundleName</key>
514514
<string>Streaming DataLoader</string>
515515
<key>CFBundleShortVersionString</key>
516-
<string>0.6</string>
516+
<string>0.7</string>
517517
</dict>
518518
<key>Options</key>
519519
<dict>
@@ -541,14 +541,14 @@
541541
<key>IFMajorVersion</key>
542542
<integer>0</integer>
543543
<key>IFMinorVersion</key>
544-
<integer>6</integer>
544+
<integer>7</integer>
545545
</dict>
546546
</dict>
547547
</dict>
548548
<key>IFPkgFlagPackageSelection</key>
549549
<integer>0</integer>
550550
<key>Name</key>
551-
<string>StreamingDataLoader_v0.6-beta_Mac_installer</string>
551+
<string>SDL_v0.7.0_Beta_Mac_Installer</string>
552552
<key>Status</key>
553553
<integer>1</integer>
554554
<key>Type</key>

‎setup/Windows/SDLLoader.exe‎

93.9 MB
Binary file not shown.

‎setup/Windows/SDLWizard.exe‎

95.1 MB
Binary file not shown.

‎setup/Windows/sdl_setup_exe.iss‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
; Script generated by the Inno Setup Script Wizard.
2+
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
3+
4+
#define MyAppName "StreamingDataLoader"
5+
#define MyAppVersion "0.7_Beta"
6+
#define MyAppPublisher "ODM2"
7+
#define MyAppURL "https://github.com/ODM2/ODM2StreamingDataLoader"
8+
#define MyAppExeName "SDLLoader.exe"
9+
#define MyAppDir "D:\DEV\SDL"
10+
#define MyWizExeName "SDLWizard.exe"
11+
12+
[Setup]
13+
; NOTE: The value of AppId uniquely identifies this application.
14+
; Do not use the same AppId value in installers for other applications.
15+
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
16+
AppId={{02A7DA47-6B76-4692-B345-9AE0659A5504}
17+
AppName={#MyAppName}
18+
AppVersion={#MyAppVersion}
19+
;AppVerName={#MyAppName} {#MyAppVersion}
20+
AppPublisher={#MyAppPublisher}
21+
AppPublisherURL={#MyAppURL}
22+
AppSupportURL={#MyAppURL}
23+
AppUpdatesURL={#MyAppURL}
24+
DefaultDirName={pf}\{#MyAppName}
25+
DefaultGroupName={#MyAppName}
26+
LicenseFile={#MyAppDir}\LICENSE.txt
27+
OutputBaseFilename={#MyAppName}_{#MyAppVersion}_Installer
28+
SetupIconFile={#MyAppDir}\src\common\icons\SDL.ico
29+
Compression=lzma
30+
SolidCompression=yes
31+
OutputDir={#MyAppDir}\setup\Dist
32+
UsePreviousAppDir=no
33+
34+
[Languages]
35+
Name: "english"; MessagesFile: "compiler:Default.isl"
36+
37+
[Tasks]
38+
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
39+
40+
[Files]
41+
;Source: "{#MyAppDir}\setup\Windows\SDLLoader\SDLLoader.exe"; DestDir: "{app}"; Flags: ignoreversion
42+
;Source: "{#MyAppDir}\setup\Windows\SDLWizard\SDLWizard.exe"; DestDir: "{app}"; Flags: ignoreversion
43+
Source: "{#MyAppDir}\setup\Windows\SDLLoader.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
44+
Source: "{#MyAppDir}\setup\Windows\SDLWizard.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
45+
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
46+
47+
[Icons]
48+
Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
49+
Name: "{group}\{#MyWizExeName}"; Filename: "{app}\{#MyWizExeName}"
50+
Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
51+
Name: "{commondesktop}\{#MyWizExeName}"; Filename: "{app}\{#MyWizExeName}"; Tasks: desktopicon
52+
53+
[Run]
54+
Filename: "{app}\{#MyWizExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
55+

‎setup/Windows/setup instructions.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
run the following commands
2+
pyinstaller --onefile src\StreamingDataLoader.py
3+
pyinstaller --onefile src\StreamingDataLoaderWizard.py

‎setup/hooks/hook-sqlalchemy.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# modify it under the terms of the GNU General Public License
77
# as published by the Free Software Foundation; either version 2
88
# of the License, or (at your option) any later version.
9-
#
9+
# bgfkh.hvkk/ljjknjb.khljh.jihljbj/j/,n m,nmn .kjm,. mlkkljm.lok/lk[k';K;'k;,',;'l/,:,,';ll;klcvxlkb;l kl;bvmknnl;nkknhohfhjihjijhojhpijhkjhjh;j.
1010
# This program is distributed in the hope that it will be useful,
1111
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1212
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -18,8 +18,13 @@
1818

1919
# Contributed by Greg Copeland
2020

21+
22+
# from PyInstaller.hooks.hookutils import exec_statement
23+
2124
from PyInstaller.utils.hooks import exec_statement
2225

26+
27+
from PyInstaller.utils.hooks import exec_statement
2328
# include most common database bindings
2429
# some database bindings are detected and include some
2530
# are not. We should explicitly include database backends.

0 commit comments

Comments
 (0)