Révision 754

tmp/org.txm.setups/shared/win/txm.nsi (revision 754)
16 16

  
17 17
;compression
18 18

  
19
SetCompressor /FINAL /SOLID lzma
19
;SetCompressor /FINAL /SOLID lzma
20 20

  
21
SetCompressorDictSize 64
21
;SetCompressorDictSize 64
22 22

  
23 23

  
24 24
;interface configuration
......
64 64

  
65 65
Page Custom MyCustomPage MyCustomLeave
66 66
Var Dialog
67
Var Checkbox1
+Var Checkbox1
68 67

  
69 68
Var CheckState1 ; Stored globally so we remember the choice if the user presses the back button and goes back to our page
70
Var Checkbox2
+Var Checkbox2
71 69

  
72 70
Var CheckState2 ; Stored globally so we remember the choice if the user presses the back button and goes back to our page
73 71
Function MyCustomPage
......
96 96
Function MyCustomLeave
97 97
  ${NSD_GetState} $Checkbox1 $CheckState1
 
98
  ${If} $CheckState1 <> 0
-
99
    file ROAMINGINSTALL
-
98
  ${If} $CheckState1 <> 0
99
  
100
    file ROAMINGINSTALL
101
    
100 102
  ${EndIf}
101 103

  
102 104
  ${NSD_GetState} $Checkbox2 $CheckState2
 
103
  ${If} $CheckState2 <> 0
-
104
    file ASKUSERDIRECTORY
-
105
  ${If} $CheckState2 <> 0
106
  
107
    file ASKUSERDIRECTORY
108
    
105 109
  ${EndIf}
106 110
FunctionEnd
107
 
108
!insertmacro MUI_PAGE_INSTFILES
 
109
!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_PAGE_INSTFILES
110 111

  
111
!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_CONFIRM
112 112

  
113
!insertmacro MUI_PAGE_FINISH
+!insertmacro MUI_UNPAGE_INSTFILES
114 113

  
114
!insertmacro MUI_PAGE_FINISH
115 115

  
116
;Languages
-
-!insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "Russian"
-
+
116
;Languages
117

  
118
!insertmacro MUI_LANGUAGE "English"
119
!insertmacro MUI_LANGUAGE "French"
120
!insertmacro MUI_LANGUAGE "Russian"
121

  
117 122
;Lang Strings ENGLISH
118 123
LangString AdvancedOptionsTitle ${LANG_ENGLISH} "Advanced options"
119 124
LangString AdvancedOptionsSubTitle ${LANG_ENGLISH} "Check these options only for specific Windows configurations"
120
LangString LocalInstallMessage ${LANG_ENGLISH} "Do not use local user directory (check this option to use a roaming Windows account home directory)."
+LangString LocalInstallMessage ${LANG_ENGLISH} "Do not use local user directory (check this option to use a roaming Windows account home directory)."
121 125

  
122
LangString AskUserDirMessage ${LANG_ENGLISH} "Do not use the user directory to store the TXM working directory (check this option to store corpora on a USB stick or on a remote directory. In this case, the working directory path will be asked at each TXM launch)."
+LangString AskUserDirMessage ${LANG_ENGLISH} "Do not use the user directory to store the TXM working directory (check this option to store corpora on a USB stick or on a remote directory. In this case, the working directory path will be asked at each TXM launch)."
123 126

  
124
LangString InfosTitleMessage ${LANG_ENGLISH} "For your information"
+LangString InfosTitleMessage ${LANG_ENGLISH} "For your information"
125 127

  
126
LangString InfosTextMessage ${LANG_ENGLISH} "If TXM is already installed on this machine, it will first be removed by this installer (TXM corpora will NOT be removed).$\nClose the window to cancel installation.$\n$\nMinimum requirements: Windows 7 64bit"
+LangString InfosTextMessage ${LANG_ENGLISH} "If TXM is already installed on this machine, it will first be removed by this installer (TXM corpora will NOT be removed).$\nClose the window to cancel installation.$\n$\nMinimum requirements: Windows 7 64bit"
127 128

  
128
LangString WelcomeTitleMessage ${LANG_ENGLISH} "Welcome to TXM setup"
+LangString WelcomeTitleMessage ${LANG_ENGLISH} "Welcome to TXM setup"
129 129

  
130
LangString WelcomeTextMessage ${LANG_ENGLISH} "TXM is provided to you free of charge. In return, in the spirit of open-source software development, you are invited to participate in its improvement. To do this, you don't have to be a software developer, you can:$\n * send us your publications or course materials related to your use of TXM;$\n * suggest corrections or improvements;$\n * translate in your language the interface or documentation;$\n * Setup a research project involving TXM adaptation and use;$\n * etc.$\n$\n See the 'Contribute' page on the TXM users' wiki: https://groupes.renater.fr/wiki/txm-users/public/contribuer $\n$\n Don't hesitate to contact us for more information at 'textometrie AT groupes.renater DOT fr'."
+LangString WelcomeTextMessage ${LANG_ENGLISH} "TXM is provided to you free of charge. In return, in the spirit of open-source software development, you are invited to participate in its improvement. To do this, you don't have to be a software developer, you can:$\n * send us your publications or course materials related to your use of TXM;$\n * suggest corrections or improvements;$\n * translate in your language the interface or documentation;$\n * Setup a research project involving TXM adaptation and use;$\n * etc.$\n$\n See the 'Contribute' page on the TXM users' wiki: https://groupes.renater.fr/wiki/txm-users/public/contribuer $\n$\n Don't hesitate to contact us for more information at 'textometrie AT groupes.renater DOT fr'."
131 130

  
132
LangString FinishTitleMessage ${LANG_ENGLISH} "Installation done"
+LangString FinishTitleMessage ${LANG_ENGLISH} "Installation done"
133 131

  
134
LangString FinishTextMessage ${LANG_ENGLISH} "The installation is done. A 'TXM' entry has been added to the 'Start' menu.$\nIf you want to automatically tag and lemmatize your corpora with the TreeTagger software during import, you need to follow additional installation instructions given in the 'Help > Install TreeTagger' menu."
+LangString FinishTextMessage ${LANG_ENGLISH} "The installation is done. A 'TXM' entry has been added to the 'Start' menu.$\nIf you want to automatically tag and lemmatize your corpora with the TreeTagger software during import, you need to follow additional installation instructions given in the 'Help > Install TreeTagger' menu."
135 132

  
136
LangString ErrorArch32Message ${LANG_ENGLISH} "This setup is for 32bit systems but your system seems to be 64bit. Please download and install the 64bit version of TXM for this machine. Continue to install anyway?"
+LangString ErrorArch32Message ${LANG_ENGLISH} "This setup is for 32bit systems but your system seems to be 64bit. Please download and install the 64bit version of TXM for this machine. Continue to install anyway?"
137 133

  
138
LangString ErrorArch64Message ${LANG_ENGLISH} "This setup is for 64bit systems but your system seems to be 32bit. Please download and install the 32bit version of TXM for this machine. Continue to install anyway?"
+LangString ErrorArch64Message ${LANG_ENGLISH} "This setup is for 64bit systems but your system seems to be 32bit. Please download and install the 32bit version of TXM for this machine. Continue to install anyway?"
139 134

  
140
LangString UninstallWindowsMessage ${LANG_ENGLISH} "TXM is already installed on this machine.$\n$\nClick `OK` to uninstall the previous version first (TXM corpora will NOT be removed).$\nOr click `Cancel` to abort this installation.$\nPlease ensure that no TXM is running during the installation process."
+LangString UninstallWindowsMessage ${LANG_ENGLISH} "TXM is already installed on this machine.$\n$\nClick `OK` to uninstall the previous version first (TXM corpora will NOT be removed).$\nOr click `Cancel` to abort this installation.$\nPlease ensure that no TXM is running during the installation process."
141 135

  
142 136

  
143 137
;Lang Strings FRENCH
144 138
LangString AdvancedOptionsTitle ${LANG_FRENCH} "Options avanc?es"
145 139
LangString AdvancedOptionsSubTitle ${LANG_FRENCH} "Ne cocher ces options que pour des configurations Windows particuli?res"
146
LangString LocalInstallMessage ${LANG_FRENCH} "Ne pas utiliser le r?pertoire utilisateur local (cocher cette option si vous souhaitez utiliser un r?pertoire de connexion de compte itin?rant)."
+LangString LocalInstallMessage ${LANG_FRENCH} "Ne pas utiliser le r?pertoire utilisateur local (cocher cette option si vous souhaitez utiliser un r?pertoire de connexion de compte itin?rant)."
147 140

  
148
LangString AskUserDirMessage ${LANG_FRENCH} "Ne pas utiliser le r?pertoire utilisateur comme r?pertoire de travail de TXM (cocher cette option pour stocker les corpus sur une cl? USB ou sur un disque distant. Dans ce cas, le chemin du r?pertoire de travail sera demand? chaque lancement de TXM)."
+LangString AskUserDirMessage ${LANG_FRENCH} "Ne pas utiliser le r?pertoire utilisateur comme r?pertoire de travail de TXM (cocher cette option pour stocker les corpus sur une cl? USB ou sur un disque distant. Dans ce cas, le chemin du r?pertoire de travail sera demand? chaque lancement de TXM)."
149 141

  
150
LangString InfosTitleMessage ${LANG_FRENCH} "Pour votre information"
+LangString InfosTitleMessage ${LANG_FRENCH} "Pour votre information"
151 142

  
152
LangString InfosTextMessage ${LANG_FRENCH} "Si TXM est d?j? install? sur cette machine, cet installeur le supprimera pour commencer (les corpus existants ne seront pas supprim?s). Pour annuler l'installation, vous pouvez fermer cette fen?tre.$\n$\nConfiguration minimum: Windows Vista 64bit"
+LangString InfosTextMessage ${LANG_FRENCH} "Si TXM est d?j? install? sur cette machine, cet installeur le supprimera pour commencer (les corpus existants ne seront pas supprim?s). Pour annuler l'installation, vous pouvez fermer cette fen?tre.$\n$\nConfiguration minimum: Windows Vista 64bit"
153 143

  
154
LangString WelcomeTitleMessage ${LANG_FRENCH} "Bienvenue dans l'installeur de TXM"
+LangString WelcomeTitleMessage ${LANG_FRENCH} "Bienvenue dans l'installeur de TXM"
155 144

  
156
LangString WelcomeTextMessage ${LANG_FRENCH} "TXM vous est fourni gracieusement. En contre-partie, dans l'esprit du logiciel libre, vous ?tes invit? ? participer ? son am?lioration. Pour cela, vous n'?tes pas oblig? d'?tre d?veloppeur informatique, vous pouvez :$\n * transmettre vos publications ou supports de cours ;$\n * proposer des corrections ou am?liorations ;$\n *  traduire l'interface ou la documentation ;$\n * monter un projet pour adapter TXM ? vos besoins ;$\n * etc.$\n$\n Voir la rubrique 'Contribuer' du wiki des utilisateurs de TXM : https://groupes.renater.fr/wiki/txm-users/public/contribuer $\n$\n N'h?sitez pas ? nous contacter pour de plus amples informations : 'textometrie AT groupes.renater DOT fr'."
+LangString WelcomeTextMessage ${LANG_FRENCH} "TXM vous est fourni gracieusement. En contre-partie, dans l'esprit du logiciel libre, vous ?tes invit? ? participer ? son am?lioration. Pour cela, vous n'?tes pas oblig? d'?tre d?veloppeur informatique, vous pouvez :$\n * transmettre vos publications ou supports de cours ;$\n * proposer des corrections ou am?liorations ;$\n *  traduire l'interface ou la documentation ;$\n * monter un projet pour adapter TXM ? vos besoins ;$\n * etc.$\n$\n Voir la rubrique 'Contribuer' du wiki des utilisateurs de TXM : https://groupes.renater.fr/wiki/txm-users/public/contribuer $\n$\n N'h?sitez pas ? nous contacter pour de plus amples informations : 'textometrie AT groupes.renater DOT fr'."
157 145

  
158
LangString FinishTitleMessage ${LANG_FRENCH} "Installation termin?e."
+LangString FinishTitleMessage ${LANG_FRENCH} "Installation termin?e."
159 146

  
160
LangString FinishTextMessage ${LANG_FRENCH} "L'installation s'est correctement termin?e. Une entr?e 'TXM' a ?t? ajout?e au menu D?marrer.$\n$\nSi vous souhaitez ?tiqueter et lemmatiser automatiquement vos corpus avec le logiciel TreeTagger lors de l'import, vous devez suivre les instructions d'installation suppl?mentaires fournies dans le menu 'Aide > Installer TreeTagger'."
+LangString FinishTextMessage ${LANG_FRENCH} "L'installation s'est correctement termin?e. Une entr?e 'TXM' a ?t? ajout?e au menu D?marrer.$\n$\nSi vous souhaitez ?tiqueter et lemmatiser automatiquement vos corpus avec le logiciel TreeTagger lors de l'import, vous devez suivre les instructions d'installation suppl?mentaires fournies dans le menu 'Aide > Installer TreeTagger'."
161 147

  
162
LangString ErrorArch32Message ${LANG_FRENCH} "La version de TXM que vous allez installer est pour un syst?me 32 bits, or votre syst?me semble ?tre 64 bits. Il faudrait t?l?charger et installer la version 64 bits de TXM. Voulez-vous malgr? tout continuer cette installation ?"
+LangString ErrorArch32Message ${LANG_FRENCH} "La version de TXM que vous allez installer est pour un syst?me 32 bits, or votre syst?me semble ?tre 64 bits. Il faudrait t?l?charger et installer la version 64 bits de TXM. Voulez-vous malgr? tout continuer cette installation ?"
163 148

  
164
LangString ErrorArch64Message ${LANG_FRENCH} "La version de TXM que vous allez installer est pour un syst?me 64 bits, or votre syst?me semble ?tre 32 bits. Il faudrait t?l?charger et installer la version 32 bits de TXM. Voulez-vous malgr? tout continuer cette installation ?"
+LangString ErrorArch64Message ${LANG_FRENCH} "La version de TXM que vous allez installer est pour un syst?me 64 bits, or votre syst?me semble ?tre 32 bits. Il faudrait t?l?charger et installer la version 32 bits de TXM. Voulez-vous malgr? tout continuer cette installation ?"
165 149

  
166
LangString UninstallWindowsMessage ${LANG_FRENCH} "TXM est d?j? install? sur cette machine. Veuillez cliquer sur 'OK' pour d?sinstaller cette version au pr?alable (les corpus seront conserv?s). Ou cliquez sur 'Annuler' pour interrompre l'installation. Merci de vous assurer que TXM n'est pas en cours d'ex?cution pendant l'installation."
+LangString UninstallWindowsMessage ${LANG_FRENCH} "TXM est d?j? install? sur cette machine. Veuillez cliquer sur 'OK' pour d?sinstaller cette version au pr?alable (les corpus seront conserv?s). Ou cliquez sur 'Annuler' pour interrompre l'installation. Merci de vous assurer que TXM n'est pas en cours d'ex?cution pendant l'installation."
167 150

  
168
 
169
;END OF LANG MESSAGES
+;END OF LANG MESSAGES
170 151

  
171
 
172
Function .onInit
+Function .onInit
173 152

  
174
	;!insertmacro MUI_LANGDLL_DISPLAY
+	;!insertmacro MUI_LANGDLL_DISPLAY
153
	
175 154

  
176
+	setOutPath $INSTDIR
155
	
177 156

  
178
	setOutPath $INSTDIR
+		ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TXM" "UninstallString"
157
		
158
		StrCmp $R0 "" done
159
		
179 160

  
180
+		MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION $(UninstallWindowsMessage) IDOK uninst
181 161

  
182
		ReadRegStr $R0 HKLM \
+		Abort
183 162

  
184
		"Software\Microsoft\Windows\CurrentVersion\Uninstall\TXM" \
 
185
		"UninstallString"
 
186
		StrCmp $R0 "" done
-
187
 
-
188
		MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-
189
		$(UninstallWindowsMessage) \
-
190
		IDOK uninst
-
191
		Abort
-
192
-
193
	;Run the uninstaller
-
194
	uninst:
-
195
		ClearErrors
-
196
		ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
-
197
		IfErrors no_remove_uninstaller done
-
198
		no_remove_uninstaller:
-
199
	done:
-
163
	;Run the uninstaller
164
	
165
	uninst:
166
	
167
		ClearErrors
168
		
169
		ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
170
		
171
		IfErrors no_remove_uninstaller done
172
		
173
		no_remove_uninstaller:
174
		
175
	done:
176
	
200 177
FunctionEnd
201 178

  
202 179
Section "Copy files" SecFiles
......
236 223
	
237 224
	SetOutPath $INSTDIR
238 225
	
239
	File /r ..\..\exportRCP\txm\*.*
226
	File /r ..\..\exportRCP\txm_win\*.*
240 227
	
241 228
	;File /r plugins
242 229
	;File /r features
......
297 284
	
298 285
	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TXM" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
299 286
	
300
	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TXM" "DisplayName" "TXM - The Textometrie project builds the new generation of modular and open-source textometry platform and application. The scientific project web site is http://textometrie.ens-lsh.fr/?lang=en. "
-
287
	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TXM" "DisplayName" "TXM - The Textometrie project builds the new generation of modular and open-source textometry platform and application. The scientific project web site is http://textometrie.ens-lsh.fr/?lang=en. "
288
	
301 289
	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TXM" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
302 290
	
303 291
SectionEnd
......
459 446

  
460 447
	#we set the default preferences
461 448
	
462
	!define pathToCqp "$INSTDIR\cwb\bin\win32\cqpserver.exe"
449
	;!define pathToCqp "$INSTDIR\cwb\bin\win32\cqpserver.exe"
463 450
	
464
	!define pathToCqpLib "$INSTDIR\cwb\bin\"
451
	;!define pathToCqpLib "$INSTDIR\cwb\bin\"
465 452
	
466
	!define pathToInit "$INSTDIR\cwb\cqpserver.init"
453
	;!define pathToInit "$INSTDIR\cwb\cqpserver.init"
467 454
	
468
	!define pathToR "$INSTDIR\R\bin\x64\Rterm.exe"
455
	;!define pathToR "$INSTDIR\R\bin\x64\Rterm.exe"
469 456
	
470
	!define pathToTT "$PROGRAMFILES\treetagger"
457
	;!define pathToTT "$PROGRAMFILES\treetagger"
471 458
	
472
	!define pathToTTMod "$PROGRAMFILES\treetagger\models"
459
	;!define pathToTTMod "$PROGRAMFILES\treetagger\models"
473 460
	
474 461

  
475
	FileOpen $4 "$INSTDIR\install.prefs" a
462
	;FileOpen $4 "$INSTDIR\install.prefs" a
476 463
	
477
	FileSeek $4 0 END
464
	;FileSeek $4 0 END
478 465
	
479
	FileWrite $4 "$\r$\ncqi_server_path_to_cqplib=${pathToCqpLib}"
466
	;FileWrite $4 "$\r$\ncqi_server_path_to_cqplib=${pathToCqpLib}"
480 467
	
481
	FileWrite $4 "$\r$\ncqi_server_path_to_executable=${pathToCqp}"
468
	;FileWrite $4 "$\r$\ncqi_server_path_to_executable=${pathToCqp}"
482 469
	
483
	FileWrite $4 "$\r$\ncqi_server_path_to_init_file=${pathToInit}"
470
	;FileWrite $4 "$\r$\ncqi_server_path_to_init_file=${pathToInit}"
484 471
	
485
	FileWrite $4 "$\r$\nr_path_to_executable=${pathToR}"
472
	;FileWrite $4 "$\r$\nr_path_to_executable=${pathToR}"
486 473
	
487
	FileWrite $4 "$\r$\ntreetagger_install_path=${pathToTT}"
474
	;FileWrite $4 "$\r$\ntreetagger_install_path=${pathToTT}"
488 475
	
489
	FileWrite $4 "$\r$\ntreetagger_models_path=${pathToTTMod}"
476
	;FileWrite $4 "$\r$\ntreetagger_models_path=${pathToTTMod}"
490 477
	
491
	FileClose $4 ; and close the file
478
	;FileClose $4 ; and close the file
492 479
	
493 480
SectionEnd
494 481

  

Formats disponibles : Unified diff