[INS] Préparation install

CMakeLists.txt

@@ -22,6 +22,11 @@ file(COPY templates DESTINATION ./ PATTERN .svn EXCLUDE)
 file(COPY datas DESTINATION ./ PATTERN .svn EXCLUDE)
 file(COPY scripts DESTINATION ./ PATTERN .svn EXCLUDE)
 
+install(DIRECTORY templates DESTINATION ./ PATTERN .svn EXCLUDE)
+install(DIRECTORY datas DESTINATION ./ PATTERN .svn EXCLUDE)
+install(DIRECTORY scripts DESTINATION ./ PATTERN .svn EXCLUDE)
+install(DIRECTORY ${CMAKE_BINARY_DIR}/i18n DESTINATION ./ PATTERN .svn EXCLUDE)
+
 find_package(Doxygen)
 if (DOXYGEN_FOUND)
 	add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})

cmake_modules/UseXinx.cmake

@@ -168,6 +168,7 @@ macro(add_xinx_plugins cible is_shared librairies version)
 
 	if(${IS_SHARED})
 		add_library(${cible} MODULE ${moc_headers} ${sources} ${winresources} ${generated_forms} ${generated_resources} )
+		install(TARGETS ${cible} DESTINATION plugins)
 	else()
 		if(CMAKE_SIZEOF_VOID_P MATCHES 8)
 			add_definitions(-fPIC)
@@ -182,5 +183,4 @@ macro(add_xinx_plugins cible is_shared librairies version)
 		set_target_properties(${cible} PROPERTIES LINK_FLAGS "-rdynamic")
 	endif(UNIX)
 
-	install(TARGETS ${cible} DESTINATION plugins)
 endmacro(add_xinx_plugins)

framework/core/version.h.in

@@ -23,7 +23,7 @@
 
 #define VERSION_MAJOR     0
 #define VERSION_MINOR     10
-#define VERSION_RELEASE   0
+#define VERSION_RELEASE   1
 #define VERSION_BUILD     ${XINX_FRAMEWORK_WC_REVISION}
 
 #define str(s) #s

setup/xinx-setup.iss

@@ -80,12 +80,14 @@ Source: {#QTDIR}\bin\QtSql4.dll; DestDir: {app}\bin; Components: application; Fl
 
 Source: {#LIBSVN}\bin\*.*; DestDir: {app}\bin; Components: svnplugin
 
-DestDir: {app}\scripts; Source: ..\scripts\*.xq; Components: application
-DestDir: {app}\datas; Source: ..\datas\*.xml; Components: application
-DestDir: {app}\templates; Source: ..\templates\*.xml; Components: application
+DestDir: {app}\scripts; Source: install\scripts\*.xq; Components: application
+DestDir: {app}\scripts; Source: install\scripts\*.js; Components: scripts
+DestDir: {app}\datas; Source: install\datas\*.xml; Components: application
+DestDir: {app}\templates; Source: install\templates\*.xml; Components: application
+DestDir: {app}\i18n; Source: install\i18n\*.qm; Components: application
 
 Source: ..\src.7z; DestDir: {app}; Components: source; Flags: replacesameversion
-;Source: ..\doc\html\*.*; DestDir: {app}\doc\api; Components: documentation; Flags: replacesameversion
+Source: ..\doc\framework.chm; DestDir: {app}\doc; Components: documentation; Flags: replacesameversion
 
 DestDir: {app}\plugins; Source: install\plugins\libservices.dll; Components: services; Flags: replacesameversion
 DestDir: {app}\plugins; Source: install\plugins\libcvsplugin.dll; Components: cvsplugin; Flags: replacesameversion
@@ -93,8 +95,6 @@ DestDir: {app}\plugins; Source: install\plugins\libsvnplugin.dll; Components: sv
 DestDir: {app}\plugins; Source: install\plugins\libsvnpluginwrapper.dll; Components: svnpluginwrapper; Flags: replacesameversion
 DestDir: {app}\plugins; Source: install\plugins\libgenerix.dll; Components: generixplugin; Flags: replacesameversion
 
-DestDir: {app}\scripts; Source: ..\scripts\*.js; Components: scripts
-
 DestDir: {app}\plugins\styles; Source: {#QTDIR}\plugins\styles\explorerstyle.dll; Components: styles; MinVersion: 0,6.0.6000; Tasks: ; Languages: 
 DestDir: {app}\plugins\styles; Source: {#QTDIR}\plugins\styles\floatstyle0.dll; Components: styles; Tasks: ; Languages: 
 DestDir: {app}\plugins\styles; Source: {#QTDIR}\plugins\styles\qtdotnet2.dll; Components: styles; MinVersion: 0,6.0.6000; Tasks: ; Languages: 
@@ -111,7 +111,7 @@ Name: {group}\style\{#AppName} (Float); Filename: {app}\bin\xinx.exe; Components
 Name: {group}\style\{#AppName} (Explorer); Filename: {app}\bin\xinx.exe; Components: application; Tasks: ; Parameters: -style Explorer; IconIndex: 0
 Name: {group}\{cm:UninstallProgram,XINX}; Filename: {uninstallexe}
 Name: {userdesktop}\{#AppName}; Filename: {app}\bin\xinx.exe; Tasks: desktopicon; Components: application
-Name: {group}\Documentation (API); Filename: {app}\doc\api\index.html; Comment: Documentation API de XINX; Components: documentation
+Name: {group}\Documentation (API); Filename: {app}\doc\framework.chm; Comment: Documentation API de XINX; Components: documentation
 
 [Registry]