install.txt was corrected.

demos installation added in CMakeLists.
Temporary problem with help appeared.

CMakeLists.txt

@@ -53,17 +53,16 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 # Locations for install targets.
+SET(KICAD_BIN bin CACHE PATH "Location of KiCad binaries.")
+
 IF(UNIX)
     IF(APPLE)
     ELSE(APPLE)
         # Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
         SET(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "")
         # When used later, "bin" and others with no leading / is relative to CMAKE_INSTALL_PREFIX.
-        SET(KICAD_BIN bin CACHE PATH "Location of KiCad binaries.")
         SET(KICAD_PLUGINS lib/kicad/plugins CACHE PATH "Location of KiCad plugins.")
         SET(KICAD_DATA share/kicad CACHE PATH "Location of KiCad data files.")
-        SET(KICAD_INTERNAT ${KICAD_DATA}/internat)
-        SET(KICAD_TEMPLATE ${KICAD_DATA}/template)
     ENDIF(APPLE)
 ENDIF(UNIX)
 
@@ -71,12 +70,14 @@ IF(WIN32)
     # Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
     SET(CMAKE_INSTALL_PREFIX c:/kicad CACHE PATH "")
     # When used later, "winexe" and others with no leading / is relative to CMAKE_INSTALL_PREFIX.
-    SET(KICAD_BIN winexe CACHE PATH "Location of KiCad binaries.")
     SET(KICAD_PLUGINS ${KICAD_BIN}/plugins)
-    SET(KICAD_INTERNAT internat)
-    SET(KICAD_TEMPLATE template)
+    SET(KICAD_DATA share CACHE PATH "Location of KiCad data files.")
 ENDIF(WIN32)
 
+SET(KICAD_DEMOS ${KICAD_DATA}/demos)
+SET(KICAD_INTERNAT ${KICAD_DATA}/internat)
+SET(KICAD_TEMPLATE ${KICAD_DATA}/template)
+
 FIND_PACKAGE(OpenGL)
 IF(OPENGL_FOUND)
     MESSAGE(STATUS "Check for installed OpenGL -- found")
@@ -124,5 +125,7 @@ ADD_SUBDIRECTORY(kicad)
 ADD_SUBDIRECTORY(pcbnew)
 ADD_SUBDIRECTORY(polygon)
 # Resources.
+ADD_SUBDIRECTORY(demos)
 ADD_SUBDIRECTORY(internat)
 ADD_SUBDIRECTORY(template)
+

common/gestfich.cpp

@@ -36,13 +36,14 @@
 // Path list for online help
 static wxString    s_HelpPathList[] = {
 #ifdef __WINDOWS__
-    wxT( "c:/kicad/doc/help/" ),
-    wxT( "d:/kicad/doc/help/" ),
-    wxT( "c:/Program Files/kicad/doc/help/" ),
+    wxT( "c:/kicad/doc/help" ),
+    wxT( "d:/kicad/doc/help" ),
+    wxT( "c:/Program Files/kicad/doc/help" ),
+    wxT( "d:/Program Files/kicad/doc/help" ),
 #else
     wxT( "/usr/share/doc/kicad/help" ),
     wxT( "/usr/local/share/doc/kicad/help" ),
-    wxT( "/usr/local/kicad/share/doc/kicad/help" ),
+    wxT( "/usr/local/kicad/share/doc/kicad/" ), // TODO: must be removed
 #endif
     wxT( "end_list" )  // End of list symbol, do not change
 };
@@ -50,14 +51,19 @@ static wxString    s_HelpPathList[] = {
 // Path list for kicad data files
 static wxString    s_KicadDataPathList[] = {
 #ifdef __WINDOWS__
-    wxT( "c:/kicad/" ),
-    wxT( "d:/kicad/" ),
-    wxT( "c:/Program Files/kicad/" ),
+    wxT( "c:/kicad/" ), // TODO: must be removed
+    wxT( "d:/kicad/" ), // TODO: must be removed
+    wxT( "c:/kicad/share/" ),
+    wxT( "d:/kicad/share/" ),
+    wxT( "c:/Program Files/kicad/" ), // TODO: must be removed
+    wxT( "d:/Program Files/kicad/" ), // TODO: must be removed
+    wxT( "c:/Program Files/kicad/share" ),
+    wxT( "d:/Program Files/kicad/share" ),
 #else
     wxT( "/usr/share/kicad/" ),
     wxT( "/usr/local/share/kicad/" ),
-    wxT( "/usr/local/kicad/share/kicad/" ),
-    wxT( "/usr/local/kicad/" ),
+    wxT( "/usr/local/kicad/share/kicad/" ), // TODO: must be removed
+    wxT( "/usr/local/kicad/" ), // TODO: must be removed
 #endif
     wxT( "end_list" )  // End of list symbol, do not change
 };
@@ -65,14 +71,20 @@ static wxString    s_KicadDataPathList[] = {
 // Path list for kicad binary files
 static wxString    s_KicadBinaryPathList[] = {
 #ifdef __WINDOWS__
-    wxT( "c:/kicad/winexe/" ),
-    wxT( "d:/kicad/winexe/" ),
+    wxT( "c:/kicad/bin/" ),
+    wxT( "d:/kicad/bin/" ),
+    wxT( "c:/kicad/winexe/" ), // TODO: must be removed
+    wxT( "d:/kicad/winexe/" ), // TODO: must be removed
+    wxT( "c:/Program Files/kicad/bin" ),
+    wxT( "d:/Program Files/kicad/bin" ),
+    wxT( "c:/Program Files/kicad/winexe" ), // TODO: must be removed
+    wxT( "d:/Program Files/kicad/winexe" ), // TODO: must be removed
 #else
     wxT( "/usr/bin/" ),
     wxT( "/usr/local/bin/" ),
     wxT( "/usr/local/kicad/bin/" ),
-    wxT( "/usr/local/kicad/linux/" ),
-    wxT( "/usr/local/kicad/linux-non_unicode/" ),
+    wxT( "/usr/local/kicad/linux/" ), // TODO: must be removed
+    wxT( "/usr/local/kicad/linux-non_unicode/" ), // TODO: must be removed
 #endif
     wxT( "end_list" )  // End of list symbol, do not change
 };
@@ -337,11 +349,11 @@ wxString FindKicadHelpPath()
 /********************************************************/
 /** Function FindKicadHelpPath
  * Find an absolute path for KiCad "help" (or "help/<language>")
- *  Find path kicad/docs/help/xx/ or kicad/docs/help/:
+ *  Find path kicad/doc/help/xx/ or kicad/doc/help/:
  *  from BinDir
  *  else from environment variable KICAD
  *  else from one of s_HelpPathList
- *  typically c:\kicad\docs\help or /usr/local/kicad/docs/help or /usr/share/doc/kicad/help
+ *  typically c:\kicad\doc\help or /usr/local/kicad/doc/help or /usr/share/doc/kicad/help
  *  (must have kicad in path name)
  *
  *  xx = iso639-1 language id (2 letters (generic) or 4 letters):

demos/CMakeLists.txt

+INSTALL(DIRECTORY electric microwave pspice test_xil_95108 ecc83 interf_u
+    DESTINATION ${KICAD_DEMOS} COMPONENT resources
+    PATTERN ".svn" EXCLUDE)
+

install.txt

@@ -16,16 +16,16 @@ See http://poedit.sourceforge.net.
 Contact me for more details.
 
 == Installation from release archive ==
-kicad-{year}-{month}-{day}.zip - archive with statically linked KiCad for Windows XP and 2000 (not Windows 98).
+kicad-{year}{month}{day}.zip - archive with statically linked KiCad for Windows XP and 2000 (not Windows 98).
 or
-kicad-{year}-{month}-{day}.tar.bz2 - archive with statically linked KiCad for Linux.
+kicad-{year}{month}{day}.tar.bz2 - archive with statically linked KiCad for Linux.
 
 Untar or unzip KiCad archive (this create the KiCad tree in the current directory).
 
 === Under Windows: ===
 Goto C:\ or D:\ (or other prefered directory).
 Examples are for an install on C:\.
-Unzip archive kicad-{year}-{month}-{day}.zip
+Unzip archive kicad-{year}{month}{day}.zip
 You must have created c:\kicad.
 Windows executables are in c:\kicad\winexe.
 The main program is kicad.exe and from it you can run other programs
@@ -36,44 +36,52 @@ I suggest you create a shortcut to c:\kicad\winexe\kicad.exe
 You do must have libc.so.6 (KiCad doesn't work with libc.so.5)
 You must have the "root" rights.
 goto /usr/local
-Untar kicad-{year}-{month}-{day}.tar.bz2 by command
- tar -jxf kicad-{year}-{month}-{day}.tar.bz2.
-(It is possible to unzip KiCad.zip: unzip KiCad.zip,
-and goto /usr/local/kicad/linux and run chmod 755 *)
-The main program is /usr/local/kicad/linux/kicad
-If you use KDE, then you can copy the shortcut /usr/local/kicad/linux/kicad.desktop
+Untar kicad-{year}{month}{day}.tar.bz2 by command
+ tar -xjpf kicad-{year}{month}{day}.tar.bz2.
+The main program is /usr/local/bin/kicad
+If you use KDE, then you can copy the shortcut /usr/local/share/kicad/kicad.desktop
 in <user home directory>/Desktop and use it to run kicad.
 
 == 3D modeler wings3D: ==
 (Usefull only if you plan to create 3D shapes for Printed board modules)
-Archive and doc files (Linux and windows ) are in ../kicad/wing3d
 goto www.wings3d.org to have more details.
 Pcbnew use the exported files in wrml (.wrl) format from wings3d (not the native .wings format).
 
 == Documentation: ==
-Currenty not only in french.
-"On line" in html format.
-Source files (200 sheets) are in OpenOffice.org (www.openoffice.org) format.
+Currenty in different languages.
+Interactive help in HTML format.
+
+Source files (200 sheets) are in OpenOffice.org (www.openoffice.org) format and
+can be obtained from kicad-doc-x.y.tar.bz2 archive (in doc_src directory).
 Can be read, printed and/or modified with OpenOffice.org Writer.
-See files in kicad/help/doc_src/*
-
-KiCad tree:
-kicad/winexe: windows (XP et 2000 compatible) binaries.
-kicad/linux: linux  binaries (Mandrake 9.2 and 10.0 tested,
-	probably work fine for distributions who have an recent libc)
-kicad/library: libraries for schematic
-kicad/library/doc: documentation files for schematic components (.pdf)
-	(readable from schematic if you have acrobat ou Xpdf)
-kicad/modules: module libraries for printed boards.
+
+== Windows KiCad tree: ==
+kicad/bin - binaries (executable files).
+kicad/doc/ - Various documentation.
+kicad/doc/help - Interactive help.
+kicad/share/demos - demos of schematic and printed boards.
+kicad/share/internat - dictionaries for interface localization.
+kicad/share/library - libraries for schematic.
+kicad/share/modules - module libraries for printed boards.
+kicad/share/modules/packages3d - many 3D shapes (.wrl and .wings
+    format) for existing modules.
 	files *.mod are the libraries,
 	and files *.brd are printed board you can see with pcbnew
 	files *.brd show the existing modules (and 3D shapes) in libraries. 
-kicad/modules/packages3d: many 3D shapes (.wrl et .wings format) for existing modules
 
-kicad/demos: Usefull...
-kicad/internat: dictionnaires des langues (actuellement anglais->francais) pour les menus
-kicad/help: On line help (in french)
-kicad/help/doc_src: Documentation (in french) (source doc, 200 sheets) under OpenOffice.
+== Linux KiCad tree: ==
+/usr/local/bin - binaries (executable files).
+/usr/local/share/doc/kicad/ - Various documentation.
+/usr/local/share/doc/kicad/help - Interactive help.
+/usr/local/share/kicad/demos - demos of schematic and printed boards.
+/usr/local/share/kicad/internat - dictionaries for interface localization.
+/usr/local/share/kicad/library - libraries for schematic.
+/usr/local/share/kicad/modules - module libraries for printed boards.
+/usr/local/share/kicad/modules/packages3d - many 3D shapes (.wrl and .wings
+    format) for existing modules.
+	files *.mod are the libraries,
+	and files *.brd are printed board you can see with pcbnew
+	files *.brd show the existing modules (and 3D shapes) in libraries. 
 
 Warning:
 Do not change the KiCad tree, or the location of binary files,