CMakeLists.txt: use elseif token instead of elif which create strange issues...

CMakeLists.txt: use elseif token instead of elif which create strange issues with some cmake versions.
Fix minor issues in nsis config files

CMakeLists.txt

@@ -70,9 +70,9 @@ option(USE_FP_LIB_TABLE "Use the new footprint library table implementation. (de
 
 if(KICAD_STABLE_VERSION AND KICAD_TESTING_VERSION )
     message(FATAL_ERROR "Only one KiCad build version option KICAD_TESTING_VERSION or KICAD_STABLE_VERSION can be set to ON")
-elif(NOT KICAD_STABLE_VERSION AND NOT KICAD_TESTING_VERSION)
+elseif(NOT KICAD_STABLE_VERSION AND NOT KICAD_TESTING_VERSION)
     message(FATAL_ERROR "Either KiCad build version option KICAD_TESTING_VERSION or KICAD_STABLE_VERSION must be set to ON")
-elif(KICAD_STABLE_VERSION)
+elseif(KICAD_STABLE_VERSION)
     add_definitions(-DKICAD_STABLE_VERSION)
     message( "Build stable version of KiCad")
 else()

packaging/windows/nsis/Dutch.nsh

 ;Additional text definitions for Dutch
 
 ;File name of license file
-LicenseLangString MUILicense ${LANG_DUTCH} "..\licendoc.txt"
+LicenseLangString MUILicense ${LANG_DUTCH} "..\COPYRIGHT.txt"
 
 ;Component option
 LangString TITLE_SEC01 ${LANG_DUTCH} "Hoofdprogramma"

packaging/windows/nsis/English.nsh

 ;Additional text definitions for English
 
 ;File name of license file
-LicenseLangString MUILicense ${LANG_ENGLISH} "..\licendoc.txt"
+LicenseLangString MUILicense ${LANG_ENGLISH} "..\COPYRIGHT.txt"
 
 ;Component option
 LangString TITLE_SEC01 ${LANG_ENGLISH} "Main application"

packaging/windows/nsis/French.nsh

@@ -3,7 +3,7 @@
 ;Please correct as required
 
 ;file name of license file
-LicenseLangString MUILicense ${LANG_FRENCH} "..\licendoc.txt"
+LicenseLangString MUILicense ${LANG_FRENCH} "..\COPYRIGHT.txt"
 
 ;Component options
 LangString TITLE_SEC01 ${LANG_FRENCH} "Application principale"
@@ -28,4 +28,4 @@ Ceci enl
 LangString UNINST_SUCCESS ${LANG_FRENCH} "$(^Name) a été avec succès enlevé à partir de votre ordinateur."
 LangString INSTALLER_RUNNING ${LANG_FRENCH} "L'installateur fonctionne déjà."
 LangString UNINSTALLER_RUNNING ${LANG_FRENCH} "Le desinstalleur fonctionne déjà."
-LangString ALREADY_INSTALLED ${LANG_FRENCH} "${PRODUCT_NAME} est déjà installé. Installer ce paquet remplacera les dossiers existants. Voulez-vous continuer ?"
\ No newline at end of file
+LangString ALREADY_INSTALLED ${LANG_FRENCH} "${PRODUCT_NAME} est déjà installé. Installer ce paquet remplacera les dossiers existants. Voulez-vous continuer ?"

packaging/windows/nsis/Italian.nsh

@@ -3,7 +3,7 @@
 ;Please correct as required
 
 ;File name of license file
-LicenseLangString MUILicense ${LANG_ITALIAN} "..\licendoc.txt"
+LicenseLangString MUILicense ${LANG_ITALIAN} "..\COPYRIGHT.txt"
 
 ;Component option
 LangString TITLE_SEC01 ${LANG_ITALIAN} "Applicazione principale"
@@ -28,4 +28,4 @@ Ci
 LangString UNINST_SUCCESS ${LANG_ITALIAN} "$(^Name) con successo è stato rimosso dal vostro calcolatore."
 LangString INSTALLER_RUNNING ${LANG_ITALIAN} "L'installatore già sta funzionando."
 LangString UNINSTALLER_RUNNING ${LANG_ITALIAN} "Il uninstaller già sta funzionando."
-LangString ALREADY_INSTALLED ${LANG_ITALIAN} "${product_name} già è installato. Installi questo pacchetto scriverà sopra le lime attuali. Desiderate continuare?"
\ No newline at end of file
+LangString ALREADY_INSTALLED ${LANG_ITALIAN} "${product_name} già è installato. Installi questo pacchetto scriverà sopra le lime attuali. Desiderate continuare?"

packaging/windows/nsis/Japanese.nsh

 ;Additional text definitions for Japanese
 
 ;File name of license file
-LicenseLangString MUILicense ${LANG_JAPANESE} "..\licendoc.txt"
+LicenseLangString MUILicense ${LANG_JAPANESE} "..\COPYRIGHT.txt"
 
 ;Component option
 LangString TITLE_SEC01 ${LANG_JAPANESE} "メイン アプリケーション"

packaging/windows/nsis/Polish.nsh

 ;Additional text definitions for Polish
 
 ;File name of license file
-LicenseLangString MUILicense ${LANG_POLISH} "..\licendoc.txt"
+LicenseLangString MUILicense ${LANG_POLISH} "..\COPYRIGHT.txt"
 
 ;Component option
 LangString TITLE_SEC01 ${LANG_POLISH} "Pliki aplikacji"
@@ -25,4 +25,4 @@ Zostan
 LangString UNINST_SUCCESS ${LANG_POLISH} "$(^Name) zosta pomylnie usunity z twojego komputera."
 LangString INSTALLER_RUNNING ${LANG_POLISH} "Instalator jest ju uruchomiony."
 LangString UNINSTALLER_RUNNING ${LANG_POLISH} "Deinstalator jest ju uruchomiony."
-LangString ALREADY_INSTALLED ${LANG_POLISH} "${PRODUCT_NAME} jest ju zainstalowany. Ponowna instalacja nadpisze istniejce pliki. Czy kontynuowa?"
\ No newline at end of file
+LangString ALREADY_INSTALLED ${LANG_POLISH} "${PRODUCT_NAME} jest ju zainstalowany. Ponowna instalacja nadpisze istniejce pliki. Czy kontynuowa?"

packaging/windows/nsis/Portuguese.nsh

@@ -3,7 +3,7 @@
 ;Please correct as required
 
 ;File name of license file
-LicenseLangString MUILicense ${LANG_PORTUGUESE} "..\licendoc.txt"
+LicenseLangString MUILicense ${LANG_PORTUGUESE} "..\COPYRIGHT.txt"
 
 ;Component option
 LangString TITLE_SEC01 ${LANG_PORTUGUESE} "Aplicativo principal"
@@ -27,4 +27,4 @@ Isto remover
 LangString UNINST_SUCCESS ${LANG_PORTUGUESE} "$(^Name) foi removido com sucesso de seu computador."
 LangString INSTALLER_RUNNING ${LANG_PORTUGUESE} "O instalador já está executando."
 LangString UNINSTALLER_RUNNING ${LANG_PORTUGUESE} "O uninstaller já está executando."
-LangString ALREADY_INSTALLED ${LANG_PORTUGUESE} "${product_name} já está instalado. Instalar este pacote irá sobrepor os arquivos existentes. Você quer continuar?"
\ No newline at end of file
+LangString ALREADY_INSTALLED ${LANG_PORTUGUESE} "${product_name} já está instalado. Instalar este pacote irá sobrepor os arquivos existentes. Você quer continuar?"

packaging/windows/nsis/Russian.nsh

 ;Additional text definitions for French
 
 ;file name of license file
-LicenseLangString MUILicense ${LANG_RUSSIAN} "..\licendoc.txt"
+LicenseLangString MUILicense ${LANG_RUSSIAN} "..\COPYRIGHT.txt"
 
 ;component option
-LangString TITLE_SEC01 ${LANG_RUSSIAN} " "
-LangString TITLE_SEC02 ${LANG_RUSSIAN} "  "
-LangString TITLE_SEC03 ${LANG_RUSSIAN} " "
-LangString TITLE_SEC04 ${LANG_RUSSIAN} " "
+LangString TITLE_SEC01 ${LANG_RUSSIAN} " "
+LangString TITLE_SEC02 ${LANG_RUSSIAN} "  "
+LangString TITLE_SEC03 ${LANG_RUSSIAN} " "
+LangString TITLE_SEC04 ${LANG_RUSSIAN} " "
 
 ;component option descriptions
-LangString DESC_SEC01 ${LANG_RUSSIAN} "  ."
-LangString DESC_SEC02 ${LANG_RUSSIAN} "   ,     ."
-LangString DESC_SEC03 ${LANG_RUSSIAN} "     ."
-LangString DESC_SEC04 ${LANG_RUSSIAN} "    pdf."
+LangString DESC_SEC01 ${LANG_RUSSIAN} "  ."
+LangString DESC_SEC02 ${LANG_RUSSIAN} "        ."
+LangString DESC_SEC03 ${LANG_RUSSIAN} "    ."
+LangString DESC_SEC04 ${LANG_RUSSIAN} " ."
 
 ;warning messages
-LangString WINGS3D_PROMPT ${LANG_RUSSIAN} "    3D    Wings3D. \
-Wings3D         web- Wings3D. \
-    ,   web- Wings3D."
+LangString WINGS3D_PROMPT ${LANG_RUSSIAN} "    ,  3D   Wings3D. \
+Wings3D      download    web page Wings3D      \
+ web page Wings3D."
 
-LangString UNINST_PROMPT ${LANG_RUSSIAN} " ,     ${product_name}   ? $\n \
-          ,      "
+LangString UNINST_PROMPT ${LANG_RUSSIAN} "      $(^name)     ? $\n \
+       ,      "
 
-LangString UNINST_SUCCESS ${LANG_RUSSIAN} "$(^name)     ."
-LangString INSTALLER_RUNNING ${LANG_RUSSIAN} "  $(^name)  ."
-LangString UNINSTALLER_RUNNING ${LANG_RUSSIAN} "  $(^name)  ."
-LangString ALREADY_INSTALLED ${LANG_RUSSIAN} "${product_name}  . $\n \
-     . \
-?"
+LangString UNINST_SUCCESS ${LANG_RUSSIAN} "$(^name)     ."
+LangString INSTALLER_RUNNING ${LANG_RUSSIAN} "  ."
+LangString UNINSTALLER_RUNNING ${LANG_RUSSIAN} "  ."
+LangString ALREADY_INSTALLED ${LANG_RUSSIAN} "${product_name}  .    overwrite existing . \
+  ?"

packaging/windows/nsis/Spanish.nsh

@@ -3,7 +3,7 @@
 ;Please correct as required
 
 ;file name of license file
-LicenseLangString MUILicense ${LANG_SPANISH} "..\licendoc.txt"
+LicenseLangString MUILicense ${LANG_SPANISH} "..\COPYRIGHT.txt"
 
 ;component option
 LangString TITLE_SEC01 ${LANG_SPANISH} "Uso principal"
@@ -28,4 +28,4 @@ Esto tambi
 LangString UNINST_SUCCESS ${LANG_SPANISH} "$(^Name) fue quitado con éxito de su computadora."
 LangString INSTALLER_RUNNING ${LANG_SPANISH} "El instalador está funcionando ya."
 LangString UNINSTALLER_RUNNING ${LANG_SPANISH} "El uninstaller está funcionando ya."
-LangString ALREADY_INSTALLED ${LANG_SPANISH} "${product_name} está instalado ya. Instale este paquete sobreescribirá archivos existentes. ¿Usted desea continuar?"
\ No newline at end of file
+LangString ALREADY_INSTALLED ${LANG_SPANISH} "${product_name} está instalado ya. Instale este paquete sobreescribirá archivos existentes. ¿Usted desea continuar?"

packaging/windows/nsis/install.nsi

@@ -17,12 +17,12 @@
 
 ; General Product Description Definitions
 !define PRODUCT_NAME "KiCad"
-!define PRODUCT_VERSION "2011.11.30"
+!define PRODUCT_VERSION "2013.02.26"
 !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
 !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
 !define COMPANY_NAME ""
 !define TRADE_MARKS ""
-!define COPYRIGHT "Kicad Team (Jean-Pierre Charras et all)"
+!define COPYRIGHT "Kicad Developers Team"
 !define COMMENTS ""
 !define HELP_WEB_SITE "http://groups.yahoo.com/group/kicad-users/"
 !define DEVEL_WEB_SITE "https://launchpad.net/~kicad-developers/"
@@ -36,7 +36,7 @@ SetCompressor /final /solid lzma
 CRCCheck force
 XPStyle on
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "${PRODUCT_NAME}.exe"
+OutFile "${PRODUCT_NAME}_stable-${PRODUCT_VERSION}-BZR3974_Win_full_version.exe"
 InstallDir "$PROGRAMFILES\KiCad"
 ShowInstDetails hide
 ShowUnInstDetails hide
@@ -117,13 +117,15 @@ Section $(TITLE_SEC01) SEC01
   SetOutPath "$INSTDIR"
   File /nonfatal "..\AUTHORS.txt"
   File /nonfatal "..\COPYRIGHT.txt"
-  File /nonfatal "..\licendoc.txt"
+  File /nonfatal "..\license_for_documentation.txt"
   SetOutPath "$INSTDIR\share\template"
   File /nonfatal /r "..\share\template\*"
   SetOutPath "$INSTDIR\bin"
   File /r "..\bin\*"
   SetOutPath "$INSTDIR\share\internat"
   File /r "..\share\internat\*"
+  SetOutPath "$INSTDIR\python"
+  File /nonfatal /r "..\python\*"
 SectionEnd
 
 Section $(TITLE_SEC02) SEC02