Skip to content

Commit

Permalink
Merge pull request #97 from quintijn/installerdetails
Browse files Browse the repository at this point in the history
Installerdetails
  • Loading branch information
quintijn authored Apr 13, 2022
2 parents 63918fc + 8728ef8 commit 56a9e9b
Show file tree
Hide file tree
Showing 73 changed files with 14,136 additions and 145 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,5 @@ MacroSystem/*_vcl.py

# Visual Studio
.vs
/PyTest/readwritefiletest/*.txt
/PyTest/readwritefiletest/*out.ini
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ add_subdirectory ("NatlinkSource")
# Build the NatlinkModule, that is, depend on the previous step and
# make sure that the Python sources and such are fresh. Mark this
# situation as a file NatlinkModule/NatlinkModule.STAMP. Similarly, mark
# mark the up-to-dateness of the tests as NatlinkModule/InstallTest.STAMP
# mark the up-to-dateness of the tests as NatlinkModule/DefaultConfig.STAMP
add_subdirectory ("NatlinkModule") # build two
# Now, using dependcy on the stamps, start the inno installation generator
add_subdirectory ("InstallerSource")
2 changes: 1 addition & 1 deletion InstallerSource/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ string(REPLACE "." "" PYTHON_VERSION_NO_DOT ${PYTHON_VERSION})
add_custom_command(OUTPUT "${INSTALLER_FILE_BASE}.exe"
DEPENDS StampDriver # otherwise the stamps are not checked
${PROJECT_BINARY_DIR}/NatlinkModule/NatlinkModule.STAMP
${PROJECT_BINARY_DIR}/NatlinkModule/InstallTest.STAMP
${PROJECT_BINARY_DIR}/NatlinkModule/DefaultConfig.STAMP
inno-setup-natlink.iss inno-code.iss
COMMENT "Now Building Installer"
COMMAND ${ISCC}
Expand Down
4 changes: 2 additions & 2 deletions InstallerSource/inno-setup-natlink.iss
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ Source: "{#CoreDir}\_natlink_core{code:GetDragonVersion}.pyd"; DestDir: "{#CoreD
Source: "{code:GetPythonInstallPath}\python{#PythonVersionNoDot}.dll"; DestDir: "{#CoreDir}"; \
Flags: external ignoreversion;

; InstallTest
Source: "{#SourceRoot}\NatlinkModule\InstallTest\*"; DestDir: "{app}\InstallTest"; Flags: ignoreversion
; DefaultConfig
Source: "{#SourceRoot}\NatlinkModule\DefaultConfig\*"; DestDir: "{app}\DefaultConfig"; Flags: ignoreversion


[Icons]
Expand Down
29 changes: 29 additions & 0 deletions NatlinkConfigure/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
The natlinkconfigfunctions.py is now a very much simplified version of the python2 version.

This is because the natlink installer program handles the enabling of Natlink itself. Elevated mode is
no longer needed.



With the GUI (configurenatlink.pyw) you can configure NatLink, Vocola and Unimacro, but also DragonFly, via the UserDirectory.

This program is written in wxPython.

The definitions are made with the (nonfree) program: wxDesigner (see http://www.roebling.de)

The definition file for wxDesigner is called configurenatlink.wdr, these definitions that were
translated by wxDesigner into configurenatlink_wdr.py, and it is this file that is used by configurenatlink.pyw.

It is unwise to edit these 2 files by hand, as they will be regenerated if a new wxDesigner run is done.

The program configurenatlink.pyw uses uses functions from the module: natlinkconfigfunctions.py.

If the GUI program doesn't work for some reason, you can fall back to
the command line interface, which is contained in
natlinkconfigfunctions.py. Just start this program from the start
menu or the folder that you are in now, preferably in elevated mode too with start_natlinkconfigfunctions.py

Quintijn Hoogenboom, February 18, 2008, (...)April 2022 (python3)



Loading

0 comments on commit 56a9e9b

Please sign in to comment.