Commit 0fb8f818 authored by plyatov's avatar plyatov

docs->doc and help->doc/help relocation. DO NOT UPDATE YOU WORKING COPY UNTIL...

docs->doc and help->doc/help relocation. DO NOT UPDATE YOU WORKING COPY UNTIL MY NOTEsvn st! Huge files will be relocated.
parent 1da6b3a4
...@@ -52,6 +52,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX) ...@@ -52,6 +52,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_CXX_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG") SET(CMAKE_CXX_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")
ENDIF(CMAKE_COMPILER_IS_GNUCXX) ENDIF(CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "")
# Locations for install targets. # Locations for install targets.
IF(UNIX) IF(UNIX)
IF(APPLE) IF(APPLE)
...@@ -62,6 +63,7 @@ IF(UNIX) ...@@ -62,6 +63,7 @@ IF(UNIX)
SET(KICAD_BIN bin CACHE PATH "Location of KiCad binaries.") SET(KICAD_BIN bin CACHE PATH "Location of KiCad binaries.")
SET(KICAD_PLUGINS lib/kicad/plugins CACHE PATH "Location of KiCad plugins.") SET(KICAD_PLUGINS lib/kicad/plugins CACHE PATH "Location of KiCad plugins.")
SET(KICAD_DOCS share/doc/kicad CACHE PATH "Location of KiCad documentation files.") SET(KICAD_DOCS share/doc/kicad CACHE PATH "Location of KiCad documentation files.")
SET(KICAD_HELP share/doc/kicad/help CACHE PATH "Location of KiCad help files.")
SET(KICAD_DATA share/kicad CACHE PATH "Location of KiCad data files.") SET(KICAD_DATA share/kicad CACHE PATH "Location of KiCad data files.")
SET(KICAD_MODULES ${KICAD_DATA}/modules) SET(KICAD_MODULES ${KICAD_DATA}/modules)
SET(KICAD_LIBRARY ${KICAD_DATA}/library) SET(KICAD_LIBRARY ${KICAD_DATA}/library)
...@@ -77,6 +79,7 @@ IF(WIN32) ...@@ -77,6 +79,7 @@ IF(WIN32)
SET(KICAD_BIN winexe CACHE PATH "Location of KiCad binaries.") SET(KICAD_BIN winexe CACHE PATH "Location of KiCad binaries.")
SET(KICAD_PLUGINS ${KICAD_BIN}/plugins) SET(KICAD_PLUGINS ${KICAD_BIN}/plugins)
SET(KICAD_DOCS help) SET(KICAD_DOCS help)
SET(KICAD_HELP ${KICAD_DOCS}/help)
SET(KICAD_MODULES modules) SET(KICAD_MODULES modules)
SET(KICAD_LIBRARY library) SET(KICAD_LIBRARY library)
SET(KICAD_INTERNAT internat) SET(KICAD_INTERNAT internat)
...@@ -131,7 +134,7 @@ ADD_SUBDIRECTORY(pcbnew) ...@@ -131,7 +134,7 @@ ADD_SUBDIRECTORY(pcbnew)
ADD_SUBDIRECTORY(polygon) ADD_SUBDIRECTORY(polygon)
# Resources. # Resources.
ADD_SUBDIRECTORY(internat) ADD_SUBDIRECTORY(internat)
ADD_SUBDIRECTORY(help) ADD_SUBDIRECTORY(doc)
ADD_SUBDIRECTORY(library) ADD_SUBDIRECTORY(library)
ADD_SUBDIRECTORY(modules) ADD_SUBDIRECTORY(modules)
ADD_SUBDIRECTORY(template) ADD_SUBDIRECTORY(template)
...@@ -36,15 +36,13 @@ ...@@ -36,15 +36,13 @@
// Path list for online help // Path list for online help
static wxString s_HelpPathList[] = { static wxString s_HelpPathList[] = {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
wxT( "c:/kicad/help/" ), wxT( "c:/kicad/doc/help/" ),
wxT( "d:/kicad/help/" ), wxT( "d:/kicad/doc/help/" ),
wxT( "c:/Program Files/kicad/help/" ), wxT( "c:/Program Files/kicad/doc/help/" ),
#else #else
wxT( "/usr/share/doc/kicad/" ),
wxT( "/usr/local/share/doc/kicad/" ),
wxT( "/usr/local/kicad/share/doc/kicad/" ),
wxT( "/usr/local/kicad/help/" ),
wxT( "/usr/share/doc/kicad/help" ), wxT( "/usr/share/doc/kicad/help" ),
wxT( "/usr/local/share/doc/kicad/help" ),
wxT( "/usr/local/kicad/share/doc/kicad/help" ),
#endif #endif
wxT( "end_list" ) // End of list symbol, do not change wxT( "end_list" ) // End of list symbol, do not change
}; };
...@@ -338,12 +336,12 @@ wxString EDA_FileSelector( const wxString& Title, /* Dialog ti ...@@ -338,12 +336,12 @@ wxString EDA_FileSelector( const wxString& Title, /* Dialog ti
wxString FindKicadHelpPath() wxString FindKicadHelpPath()
/********************************************************/ /********************************************************/
/** Function FindKicadHelpPath /** Function FindKicadHelpPath
* Find an absolute path for kicad/help (or kicad/help/<language>) * Find an absolute path for KiCad "help" (or "help/<language>")
* Find path kicad/help/xx/ ou kicad/help/: * Find path kicad/docs/help/xx/ or kicad/docs/help/:
* from BinDir * from BinDir
* else from environment variable KICAD * else from environment variable KICAD
* else from one of s_HelpPathList * else from one of s_HelpPathList
* typically c:\kicad\help or /usr/local/kicad/help or /usr/share/doc/kicad * typically c:\kicad\docs\help or /usr/local/kicad/docs/help or /usr/share/doc/kicad/help
* (must have kicad in path name) * (must have kicad in path name)
* *
* xx = iso639-1 language id (2 letters (generic) or 4 letters): * xx = iso639-1 language id (2 letters (generic) or 4 letters):
......
INSTALL(DIRECTORY de COMPONENT doc-de
DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE PATTERN "*.odt" EXCLUDE)
INSTALL(DIRECTORY en COMPONENT doc-en
DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE PATTERN "*.odt" EXCLUDE)
INSTALL(DIRECTORY es COMPONENT doc-es
DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE PATTERN "*.odt" EXCLUDE)
INSTALL(DIRECTORY fr COMPONENT doc-fr
DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE PATTERN "*.odt" EXCLUDE)
INSTALL(DIRECTORY hu COMPONENT doc-hu
DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE PATTERN "*.odt" EXCLUDE)
INSTALL(DIRECTORY ru COMPONENT doc-ru
DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE PATTERN "*.odt" EXCLUDE)
ADD_SUBDIRECTORY(help)
INSTALL(DIRECTORY de COMPONENT help-de
DESTINATION ${KICAD_HELP} PATTERN ".svn" EXCLUDE PATTERN "docs_src" EXCLUDE)
INSTALL(DIRECTORY en COMPONENT help-en
DESTINATION ${KICAD_HELP} PATTERN ".svn" EXCLUDE PATTERN "docs_src" EXCLUDE)
INSTALL(DIRECTORY es COMPONENT help-es
DESTINATION ${KICAD_HELP} PATTERN ".svn" EXCLUDE PATTERN "docs_src" EXCLUDE)
INSTALL(DIRECTORY fr COMPONENT help-fr
DESTINATION ${KICAD_HELP} PATTERN ".svn" EXCLUDE PATTERN "docs_src" EXCLUDE)
INSTALL(DIRECTORY it COMPONENT help-it
DESTINATION ${KICAD_HELP} PATTERN ".svn" EXCLUDE PATTERN "docs_src" EXCLUDE)
INSTALL(DIRECTORY pt COMPONENT help-pt
DESTINATION ${KICAD_HELP} PATTERN ".svn" EXCLUDE PATTERN "docs_src" EXCLUDE)
INSTALL(DIRECTORY ru COMPONENT help-ru
DESTINATION ${KICAD_HELP} PATTERN ".svn" EXCLUDE PATTERN "docs_src" EXCLUDE)
INSTALL(DIRECTORY de COMPONENT doc-de
DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
INSTALL(DIRECTORY en COMPONENT doc-en
DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
INSTALL(DIRECTORY es COMPONENT doc-es
DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
INSTALL(DIRECTORY fr COMPONENT doc-fr
DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
INSTALL(DIRECTORY it COMPONENT doc-it
DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
INSTALL(DIRECTORY pt COMPONENT doc-pt
DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
INSTALL(DIRECTORY ru COMPONENT doc-ru
DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment