X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=setup.nsi;h=859ebdb39e2f6688617da08ead764bf32a72f66e;hb=2617e3425eff1ef0b4007f6f2235933538e9bf6f;hp=3c7d59358863003470dbe2a7b2a0aad3d09f6253;hpb=e2ab4de3e074f093385885ea7f19b7afee47e592;p=odoo%2Fodoo.git

diff --git a/setup.nsi b/setup.nsi
index 3c7d593..859ebdb 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -21,7 +21,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #####################################################################################
 
 !include 'MUI2.nsh'
@@ -160,7 +160,7 @@ LangString DESC_PostgreSQL_Username ${LANG_FRENCH} "Utilisateur"
 LangString DESC_PostgreSQL_Password ${LANG_FRENCH} "Mot de passe"
 
 Section -StopService
-    nsExec::Exec "net stop openerp-server-6.1"
+    nsExec::Exec "net stop openerp-server-7.0"
     sleep 2
 SectionEnd
 
@@ -168,6 +168,7 @@ Section OpenERP_Server SectionOpenERP_Server
     SetOutPath '$INSTDIR\server'
 
     File /r "dist\*"
+    File /r "win32\wkhtmltopdf\*"
 
     SetOutPath "$INSTDIR\service"
     File /r "win32\dist\*"
@@ -201,7 +202,7 @@ Section OpenERP_Server SectionOpenERP_Server
 SectionEnd
 
 Section -RestartServer
-    nsExec::Exec "net start openerp-server-6.1"
+    nsExec::Exec "net start openerp-server-7.0"
     sleep 2
 SectionEnd
 
@@ -225,11 +226,11 @@ SectionEnd
 
 Section "Uninstall"
     ; Stop the NT Service
-    nsExec::Exec "net stop openerp-server-6.1"
+    nsExec::Exec "net stop openerp-server-7.0"
     sleep 2
 
     ; Uninstall the OpenERP Service
-    nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -remove'
+    nsExec::Exec '"$INSTDIR\..\service\OpenERPServerService.exe" -remove'
     sleep 2
 
     Rmdir /r "$INSTDIR\service"
@@ -290,9 +291,10 @@ Function .onInit
     !insertmacro MUI_LANGDLL_DISPLAY
 
     ClearErrors
-    EnumRegKey $0 HKLM "SOFTWARE\PostgreSQL" 0
+    EnumRegKey $0 HKLM "SOFTWARE\PostgreSQL\Installations" 0
     IfErrors DoInstallPostgreSQL 0
-        StrCpy $HasPostgreSQL 1
+    StrCmp $0 "" DoInstallPostgreSQL
+    StrCpy $HasPostgreSQL 1
 
     DoInstallPostgreSQL:
 FunctionEnd