Skip to content
This repository was archived by the owner on Oct 15, 2019. It is now read-only.

Commit

Permalink
Installer fixes
Browse files Browse the repository at this point in the history
Get mkspecs right (not everyone has the same user name as me).
Get headers right (before it only installed the forwarding headers).
Show windows style paths in installer (c:\... instead of c:/...).
Allow spaces in target dir.
  • Loading branch information
gladhorn committed Jul 5, 2013
1 parent b7e05f0 commit db03aa6
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 1 deletion.
1 change: 1 addition & 0 deletions dist/config/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
<StartMenuDir>Enginio</StartMenuDir>
<ProductUrl>http://engin.io</ProductUrl>
<TargetDir>@homeDir@/enginio</TargetDir>
<AllowSpaceInPath>true</AllowSpaceInPath>
</Installer>
32 changes: 31 additions & 1 deletion dist/create_installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
os.chdir("../..")

packages = {
"com.digia.enginio": ["include", "lib", "qml", "mkspecs", "doc/enginio-qt.qch", ],
"com.digia.enginio": ["include", "lib", "qml", "doc/enginio-qt.qch", ],
"com.digia.enginioExamples": ["examples",],
"com.digia.enginioDocumentation": ["doc/enginio-qt",],
"com.digia.enginioSources": ["src",],
Expand All @@ -85,7 +85,37 @@
else:
shutil.copytree(sourcePath, dest)

# copy the real headers
# src/enginio_client
# src/enginio_plugin
headerPath = "dist/packages/com.digia.enginio/data/include/Enginio/"

#FIXME FIXME FIXME version string
privateHeaderPath = headerPath + "0.5.0/Enginio/private"
import glob
allHeaders = glob.glob("src/*/*.h")
for header in allHeaders:
# FIXME this is windows-only
fileName = header[header.rindex("\\"):]
if header.endswith("_p.h"):
print("Copy ", header, " to ", privateHeaderPath + fileName)
shutil.copyfile(header, privateHeaderPath + fileName)
else:
print("Copy ", header, " to ", headerPath + fileName)
shutil.copyfile(header, headerPath + fileName)


os.chdir("dist")



# the Module .pri file is special - take the one from mkspecs/modules_inst
modulesPath = "packages/com.digia.enginio/data/mkspecs/modules/"
os.mkdir(modulesPath + "..")
os.mkdir(modulesPath)
shutil.copyfile("build/mkspecs/modules-inst/qt_lib_enginio.pri", modulesPath + "qt_lib_enginio.pri")


subprocess.check_call([binarycreator, "-c", "config\config.xml", "-p", "packages", "EnginioInstaller"])

print("Installer created.")
1 change: 1 addition & 0 deletions dist/packages/com.digia.enginio/meta/installscript.qs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ showFileDialog = function()
{
try {
path = QFileDialog.getExistingDirectory("Select qmake.exe path", "c:\\qt\\");
path = path.replace(/\//g, "\\");
component.userInterface("QtSelectionPage").qmakePathLineEdit.text = path;
} catch (e) {
QMessageBox.warning("", "Error Installing Enginio", e);
Expand Down

0 comments on commit db03aa6

Please sign in to comment.