haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install.txt was corrected. 

demos installation added in CMakeLists.
Temporary problem with help appeared.
This commit is contained in:
plyatov 2008-03-05 07:16:43 +00:00
parent e6602b0c94
commit d4b34ab362
4 changed files with 76 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

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

42
common/gestfich.cpp
View File

@ -36,13 +36,14 @@
// 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/doc/help/" ), wxT( "c:/kicad/doc/help" ),
wxT( "d:/kicad/doc/help/" ), wxT( "d:/kicad/doc/help" ),
wxT( "c:/Program Files/kicad/doc/help/" ), wxT( "c:/Program Files/kicad/doc/help" ),
wxT( "d:/Program Files/kicad/doc/help" ),
#else #else
wxT( "/usr/share/doc/kicad/help" ), wxT( "/usr/share/doc/kicad/help" ),
wxT( "/usr/local/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 #endif
wxT( "end_list" ) // End of list symbol, do not change wxT( "end_list" ) // End of list symbol, do not change
}; };
@ -50,14 +51,19 @@ static wxString s_HelpPathList[] = {
// Path list for kicad data files // Path list for kicad data files
static wxString s_KicadDataPathList[] = { static wxString s_KicadDataPathList[] = {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
wxT( "c:/kicad/" ), wxT( "c:/kicad/" ), // TODO: must be removed
wxT( "d:/kicad/" ), wxT( "d:/kicad/" ), // TODO: must be removed
wxT( "c:/Program Files/kicad/" ), 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 #else
wxT( "/usr/share/kicad/" ), wxT( "/usr/share/kicad/" ),
wxT( "/usr/local/share/kicad/" ), wxT( "/usr/local/share/kicad/" ),
wxT( "/usr/local/kicad/share/kicad/" ), wxT( "/usr/local/kicad/share/kicad/" ), // TODO: must be removed
wxT( "/usr/local/kicad/" ), wxT( "/usr/local/kicad/" ), // TODO: must be removed
#endif #endif
wxT( "end_list" ) // End of list symbol, do not change wxT( "end_list" ) // End of list symbol, do not change
}; };
@ -65,14 +71,20 @@ static wxString s_KicadDataPathList[] = {
// Path list for kicad binary files // Path list for kicad binary files
static wxString s_KicadBinaryPathList[] = { static wxString s_KicadBinaryPathList[] = {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
wxT( "c:/kicad/winexe/" ), wxT( "c:/kicad/bin/" ),
wxT( "d:/kicad/winexe/" ), 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 #else
wxT( "/usr/bin/" ), wxT( "/usr/bin/" ),
wxT( "/usr/local/bin/" ), wxT( "/usr/local/bin/" ),
wxT( "/usr/local/kicad/bin/" ), wxT( "/usr/local/kicad/bin/" ),
wxT( "/usr/local/kicad/linux/" ), wxT( "/usr/local/kicad/linux/" ), // TODO: must be removed
wxT( "/usr/local/kicad/linux-non_unicode/" ), wxT( "/usr/local/kicad/linux-non_unicode/" ), // TODO: must be removed
#endif #endif
wxT( "end_list" ) // End of list symbol, do not change wxT( "end_list" ) // End of list symbol, do not change
}; };
@ -337,11 +349,11 @@ wxString FindKicadHelpPath()
/********************************************************/ /********************************************************/
/** Function FindKicadHelpPath /** Function FindKicadHelpPath
* Find an absolute path for KiCad "help" (or "help/<language>") * 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 * 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\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) * (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):

4
demos/CMakeLists.txt Normal file
View File

@ -0,0 +1,4 @@
INSTALL(DIRECTORY electric microwave pspice test_xil_95108 ecc83 interf_u
DESTINATION ${KICAD_DEMOS} COMPONENT resources
PATTERN ".svn" EXCLUDE)

64
install.txt
View File

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