Skip to content

Commit de99944

Browse files
cztomczakcztomczak
committed
Fixes to inno setup installer.
1 parent 92bd761 commit de99944

9 files changed

Lines changed: 10 additions & 323 deletions

File tree

‎cefpython/.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,7 @@ Release*/
2525
ctags
2626

2727
/cef1/windows/installer/Output/
28-
/cef3/windows/installer/Output/
28+
/cef3/windows/installer/Output/
29+
30+
# Inno setup files generated from a template
31+
*.generated

‎cefpython/cef1/windows/installer/__init__.py.install‎

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

‎cefpython/cef1/windows/installer/innosetup.iss‎

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

‎cefpython/cef1/windows/installer/innosetup.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Filename: "{app}\%(PACKAGE_NAME)s\examples"; Flags: postinstall shellexec;
4747
Source: "*.dll"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
4848
Source: "*.pak"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
4949
Source: "locales\*.pak"; DestDir: "{app}\%(PACKAGE_NAME)s\locales"; Flags: ignoreversion;
50-
Source: "%(INSTALLER_DIR)s\__init__.py.install"; DestDir: "{app}\%(PACKAGE_NAME)s"; DestName: "__init__.py"; Flags: ignoreversion;
50+
Source: "%(INSTALLER_DIR)s\__init__.py.generated"; DestDir: "{app}\%(PACKAGE_NAME)s"; DestName: "__init__.py"; Flags: ignoreversion;
5151
Source: "cefclient.exe"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
5252
Source: "cefpython_py27.py"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
5353
Source: "cefpython_py27.pyd"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;

‎cefpython/cef1/windows/installer/make_installer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
ISCC = os.environ["INNO5"]
1010

1111
TEMPLATE_FILE = os.getcwd()+r"\innosetup.template"
12-
ISS_FILE = os.getcwd()+r"\innosetup.iss"
12+
ISS_FILE = os.getcwd()+r"\innosetup.generated"
1313

1414
def main():
1515
parser = argparse.ArgumentParser(usage="%(prog)s [options]")
@@ -45,7 +45,7 @@ def main():
4545
print("Saved: %s" % ISS_FILE)
4646

4747
initPyTemplate = os.getcwd()+r"\__init__.py.template"
48-
initPyInstall = os.getcwd()+r"\__init__.py.install"
48+
initPyInstall = os.getcwd()+r"\__init__.py.generated"
4949

5050
f = open(initPyTemplate)
5151
initPyTemplateCode = f.read()

‎cefpython/cef3/windows/installer/__init__.py.install‎

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

‎cefpython/cef3/windows/installer/innosetup.iss‎

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

‎cefpython/cef3/windows/installer/innosetup.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Filename: "{app}\%(PACKAGE_NAME)s\examples"; Flags: postinstall shellexec;
4747
Source: "*.dll"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
4848
Source: "*.pak"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
4949
Source: "locales\*.pak"; DestDir: "{app}\%(PACKAGE_NAME)s\locales"; Flags: ignoreversion;
50-
Source: "%(INSTALLER_DIR)s\__init__.py.install"; DestDir: "{app}\%(PACKAGE_NAME)s"; DestName: "__init__.py"; Flags: ignoreversion;
50+
Source: "%(INSTALLER_DIR)s\__init__.py.generated"; DestDir: "{app}\%(PACKAGE_NAME)s"; DestName: "__init__.py"; Flags: ignoreversion;
5151
Source: "cefclient.exe"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
5252
Source: "cefpython_py27.pyd"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
5353
Source: "cefpython_py32.pyd"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;

‎cefpython/cef3/windows/installer/make_installer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
ISCC = os.environ["INNO5"]
1010

1111
TEMPLATE_FILE = os.getcwd()+r"\innosetup.template"
12-
ISS_FILE = os.getcwd()+r"\innosetup.iss"
12+
ISS_FILE = os.getcwd()+r"\innosetup.generated"
1313

1414
def main():
1515
parser = argparse.ArgumentParser(usage="%(prog)s [options]")
@@ -45,7 +45,7 @@ def main():
4545
print("Saved: %s" % ISS_FILE)
4646

4747
initPyTemplate = os.getcwd()+r"\__init__.py.template"
48-
initPyInstall = os.getcwd()+r"\__init__.py.install"
48+
initPyInstall = os.getcwd()+r"\__init__.py.generated"
4949

5050
f = open(initPyTemplate)
5151
initPyTemplateCode = f.read()

0 commit comments

Comments
 (0)