Fix the installer so that uninstall works properly and so that it shows up in
control panel. Also, fix a few minor things in the documentation for building
on Fedora.
Signed-off-by: Scott Talbert <s...@techie.net>
---
concordance/INSTALL.windows | 2 +-
concordance/win/concordance.nsi | 8 ++++++++
libconcord/INSTALL.windows | 12 ++++++++----
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/concordance/INSTALL.windows b/concordance/INSTALL.windows
index 214f782..6c331d6 100644
--- a/concordance/INSTALL.windows
+++ b/concordance/INSTALL.windows
@@ -26,7 +26,7 @@ Assuming you were following the Fedora instructions in
export MINGW_SYSROOT_DEVLIB="$MINGW_SYSROOT_BIN"
export ZLIB_LIB_PATH="$MINGW_SYSROOT_BIN"
export LIBZIP_LIB_PATH="$MINGW_SYSROOT_BIN"
- export HIDAPI_LIB_PATH="/tmp/buildroot/bin"
+ export HIDAPI_LIB_PATH="$MINGW_SYSROOT_BIN"
Or if you used the non-Fedora instructions:
export MINGW_SYSROOT_BIN="/usr/lib/gcc/i686-w64-mingw32/4.8"
diff --git a/concordance/win/concordance.nsi b/concordance/win/concordance.nsi
index 2338bda..f2feea4 100644
--- a/concordance/win/concordance.nsi
+++ b/concordance/win/concordance.nsi
@@ -49,19 +49,24 @@ Section "Concordance"
File "$%MINGW_SYSROOT_DEVLIB%/libwinpthread-1.dll"
!endif
+ WriteRegStr HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Concordance" "DisplayName"
"Concordance"
+ WriteRegStr HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Concordance"
"UninstallString" "$\"$INSTDIR\Uninstall Concordance.exe$\""
SectionEnd
Section "Start Menu Shortcuts"
+ SetShellVarContext all
CreateDirectory "$SMPROGRAMS\Concordance"
CreateShortCut "$SMPROGRAMS\Concordance\Uninstall Concordance.lnk"
"$INSTDIR\Uninstall Concordance.exe" "" "$INSTDIR\Uninstall Concordance.exe" 0
CreateShortCut "$SMPROGRAMS\Concordance\concordance.exe.lnk"
"$INSTDIR\concordance.exe" "" "$INSTDIR\concordance.exe" 0
SectionEnd
Section "Desktop Icons"
+ SetShellVarContext all
CreateShortCut "$DESKTOP\concordance.exe.lnk" "$INSTDIR\concordance.exe" ""
"$INSTDIR\concordance.exe" 0
SectionEnd
Section "Uninstall"
+ SetShellVarContext all
Delete /rebootok "$DESKTOP\concordance.exe.lnk"
Delete /rebootok "$SMPROGRAMS\Concordance\concordance.exe.lnk"
Delete /rebootok "$SMPROGRAMS\Concordance\Uninstall Concordance.lnk"
@@ -74,7 +79,10 @@ Section "Uninstall"
Delete /rebootok "$INSTDIR\concordance.exe"
Delete /rebootok "$INSTDIR\libconcord-3.dll"
Delete /rebootok "$INSTDIR\libhidapi-0.dll"
+ Delete /rebootok "$INSTDIR\Uninstall Concordance.exe"
RMDir "$INSTDIR"
+
+ DeleteRegKey HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Concordance"
SectionEnd
Section -post
diff --git a/libconcord/INSTALL.windows b/libconcord/INSTALL.windows
index 95bed90..ef553b7 100644
--- a/libconcord/INSTALL.windows
+++ b/libconcord/INSTALL.windows
@@ -33,7 +33,7 @@ source, and then:
make install
HIDAPI
-In Fedora, simply install ming32-hidapi.
+In Fedora, simply install mingw32-hidapi.
For other distributions, including building on Windows directly, grab the
source from https://github.com/signal11/hidapi. Get it from git (NOT a
@@ -45,9 +45,13 @@ release) and then:
1. BUILD THE SOFTWARE
-Building libconcord with MinGW is also fairly straight forward (you will need
-to specify the include and library paths for hidapi as below if you did not
-install it to the MinGW sysroot):
+Building libconcord with MinGW is also fairly straight forward.
+
+In Fedora:
+ mingw32-configure
+ mingw32-make
+
+For other distributions:
./configure --host=i686-w64-mingw32 --prefix=/tmp/buildroot \
CPPFLAGS="-I/tmp/buildroot/include" \
LDFLAGS="-L/tmp/buildroot/libs -L/tmp/buildroot/libs/bin" \
--
1.9.0
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
concordance-devel mailing list
concordance-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/concordance-devel
