From a62dfe2901745456e7d5a5a8995804ee9687779a Mon Sep 17 00:00:00 2001
From: Claudio Valerio <claudio@open-sankore.org>
Date: Mon, 1 Jul 2013 16:39:23 +0200
Subject: [PATCH] OpenBoardImporter works on windows

---
 OpenBoard.iss                      |  3 +++
 release.win7.vc9.bat               | 16 ++++++++++++++--
 src/core/UBOpenSankoreImporter.cpp |  6 +++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/OpenBoard.iss b/OpenBoard.iss
index 887af1cd..80b8e6f7 100644
--- a/OpenBoard.iss
+++ b/OpenBoard.iss
@@ -91,6 +91,9 @@ Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengined.dll"; DestDir:
 Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3u.dll"; DestDir: "c:\OpenBoard\plugins\playlistformats"; Flags: ignoreversion
 Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3ud.dll"; DestDir: "c:\OpenBoard\plugins\playlistformats"; Flags: ignoreversion
 
+;OpenBoardImporter
+Source: "..\OpenSankoreToOpenBoard\release\OpenBoardImporter.exe"; DestDir: "c:\OpenBoard\Importer"; Flags: ignoreversion
+
 ;fonts for xpdf
 Source: "resources\windows\xpdfrc"; DestDir: "{app}"; Flags: ignoreversion
 Source: "resources\fonts\*"; DestDir: "{app}\fonts"; Flags: ignoreversion
diff --git a/release.win7.vc9.bat b/release.win7.vc9.bat
index 1a9911f2..aa5db2b2 100644
--- a/release.win7.vc9.bat
+++ b/release.win7.vc9.bat
@@ -1,4 +1,4 @@
-echo off
+echo off
 REM --------------------------------------------------------------------
 REM This program is free software: you can redistribute it and/or modify
 REM it under the terms of the GNU General Public License as published by
@@ -36,6 +36,18 @@ call "%VS_BIN%\vcvars32.bat"
 
 echo %PATH%
 
+REM Third party impoter application
+set IMPORTER_NAME="OpenBoardImporter"
+set IMPORTER_PATH="%cd%\..\OpenSankoreToOpenBoard"
+
+IF NOT EXIST "%IMPORTER_PATH%" GOTO EXIT_WITH_ERROR
+set HOME_DIR="%cd%"
+cd %IMPORTER_PATH%
+IF EXIST "release" (del "release\*.*" /Q)
+"%QT_BIN%\qmake.exe" %IMPORTER_NAME%.pro
+nmake release
+cd %HOME_DIR%
+
 REM this checks if the custom qt directory path
 REM is correct. This is important because installer
 REM pick up dll from this directory
@@ -92,7 +104,7 @@ GOTO END
 
 :EXIT_WITH_ERROR
 echo "Error found"
-GOTO :EOF
+GOTO EOF
 
 :END
 echo "%APPLICATION_NAME% build finished"
diff --git a/src/core/UBOpenSankoreImporter.cpp b/src/core/UBOpenSankoreImporter.cpp
index 669216f1..e0a0713e 100644
--- a/src/core/UBOpenSankoreImporter.cpp
+++ b/src/core/UBOpenSankoreImporter.cpp
@@ -41,7 +41,10 @@ UBOpenSankoreImporter::UBOpenSankoreImporter(QObject *parent) :
 #elif defined Q_WS_MACX
             newProcess.startDetached(qApp->applicationDirPath()+"/../Resources/OpenBoardImporter.app/Contents/MacOS/OpenBoardImporter");
 #else
-            newProcess.startDetached(qApp->applicationDirPath()+"/Importer/OpenBoardImporter.exe");
+			// Windows does not allows to run easily an exe located in a subdirectory when the main
+			// directory is placed into programs files.
+            //newProcess.startDetached(qApp->applicationDirPath()+"\\Importer\\OpenBoardImporter.exe");
+			newProcess.startDetached("C:/OpenBoard/Importer/OpenBoardImporter.exe");
 #endif
             qApp->exit(0);
         }
@@ -49,3 +52,4 @@ UBOpenSankoreImporter::UBOpenSankoreImporter(QObject *parent) :
 }
 
 
+	
\ No newline at end of file