minor changes before creating a stable version
This commit is contained in:
CHARRAS
parent
5017812e2e
commit
05e69660a0
|
|
@ -1,6 +1,6 @@
|
|||
How to build kicad:
|
||||
|
||||
kicad do not use configure (not yet...)
|
||||
kicad do not use configure (Use of Cmake is in progress)
|
||||
it is compiled with make.
|
||||
|
||||
kicad needs wxWidgets (the multi platform G.U.I.)
|
||||
|
|
@ -31,14 +31,20 @@ make install ( libGL.a et libGLU.a are copied in /usr/local/lib, and header in /
|
|||
|
||||
kicad compilation:
|
||||
in kicad-dev:
|
||||
Have a look to libs.linux (you can edit this file if you have problems)
|
||||
Currently libs.linux uses wxWidgets 2.7.1 build (see below for suggested configure command)
|
||||
Have a look to libs.linux (you can/must edit this file if you have problems)
|
||||
Currently libs.linux uses wxWidgets 2.8.6 build (see below for suggested configure command)
|
||||
lines to edit:
|
||||
STD_INSTALL = 1
|
||||
which can be (see comments in libs.linux)
|
||||
STD_INSTALL = 1
|
||||
|
||||
after libs.linux edition:
|
||||
run make -f makefile.gtk
|
||||
|
||||
Windows compilation:
|
||||
|
||||
kicad is build with mingw and msys.
|
||||
Currently libs.linux uses wxWidgets 2.8.1 (see below for suggested configure command)
|
||||
Currently libs.win uses wxWidgets 2.8.6 (see below for suggested configure command)
|
||||
|
||||
install mingw and msys ( see mingw.org )
|
||||
(opengl libs are included in mingw or windows)
|
||||
|
|
@ -47,21 +53,20 @@ Under msys:
|
|||
(Warning: make.exe utility is sometime renamed mingw32-make.exe in install process
|
||||
of msys.)
|
||||
|
||||
Build wxWidgets (currently version 2.8.1)
|
||||
Build wxWidgets (currently version 2.8.6)
|
||||
See below for suggested configure command, then make
|
||||
|
||||
In include/wx/msw/setup.h, check (and edit if needed) the defines :
|
||||
#define wxUSE_GLCANVAS 1
|
||||
#define WXWIN_COMPATIBILITY_2_4 0
|
||||
#define wxUSE_MOUSEWHEEL 1 // Include mouse wheel support
|
||||
#define wxUSE_HOTKEY 0 // Hotkey support (currently Windows only)
|
||||
|
||||
|
||||
Exit msys.
|
||||
Set environment variable WXWIN ( something as wxwin=/d/wxWidgets-2.8.1
|
||||
for a wxWidget installed in d:\wxWidgets-2.8.1)
|
||||
Set environment variable WXWIN ( something as wxwin=/d/wxWidgets-2.8.6
|
||||
for a wxWidget installed in d:\wxWidgets-2.8.6)
|
||||
|
||||
Have a look to libs.win (Currently this file handle wxWidgets 2.8.1)
|
||||
Have a look to libs.win (Currently this file handle wxWidgets 2.8.6)
|
||||
|
||||
Under msys:
|
||||
in kicad-dev:
|
||||
|
|
@ -101,7 +106,7 @@ Patch wxWidgets
|
|||
wxGTK version:
|
||||
*************************************************************************************
|
||||
Patch for printing wide traces that were showing missing rounded end caps:
|
||||
wxGTK-2.8.1/src/generic/dcpsg.cpp
|
||||
wxGTK-2.8.6/src/generic/dcpsg.cpp
|
||||
line 1634
|
||||
PsPrint( "%%EndProlog\n" );
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
COMMON_GLOBL wxString g_BuildVersion
|
||||
#ifdef EDA_BASE
|
||||
(wxT("(2007-11-05)"))
|
||||
(wxT("(2007-11-09)"))
|
||||
#endif
|
||||
;
|
||||
|
||||
|
|
|
|||
Binary file not shown.
1571
internat/fr/kicad.po
1571
internat/fr/kicad.po
File diff suppressed because it is too large
Load Diff
36
libs.linux
36
libs.linux
|
|
@ -2,16 +2,36 @@
|
|||
# Configuration for kicad build & install
|
||||
#
|
||||
|
||||
# You must comment or uncomment this line to disable/enable python support
|
||||
#KICAD_PYTHON = 1
|
||||
|
||||
# Locations for install targets. All can be overriden on the make command.
|
||||
# Normally you'd only expect to override the PREFIX if you want to install to
|
||||
# a non standard install dir (or a temp location for packaging).
|
||||
# For packaging you can override and install anywhere, but to run from a
|
||||
# non-standard location edit common/gestfich.ccp so it knows where to
|
||||
# load help/data/etc. files from.
|
||||
# Current supported PREFIXes are /usr, /usr/local & /usr/local/kicad
|
||||
# Current supported PREFIXes are /usr and /usr/local (standard install for distributions)
|
||||
# and /usr/local/kicad is used when STD_INSTALL = 0 or STD_INSTALL = 2
|
||||
# all kicad files will be in /usr/local/kicad
|
||||
# STD_INSTALL = 2 is used only to make static link (only useful when kicad run on an other
|
||||
# linux distribution than the distributions used to compil kicad.
|
||||
|
||||
STD_INSTALL = 1
|
||||
|
||||
#*******************************************
|
||||
#*******************************************
|
||||
|
||||
ifndef KICAD_PYTHON
|
||||
ifeq ($(STD_INSTALL), 2)
|
||||
KICAD_STATIC_LINK = 1
|
||||
endif
|
||||
endif
|
||||
|
||||
ifndef KICAD_STATIC_LINK
|
||||
KICAD_STATIC_LINK = 0
|
||||
endif
|
||||
|
||||
ifeq ($(STD_INSTALL), 1)
|
||||
PREFIX = /usr
|
||||
KICAD_BIN = $(PREFIX)/bin
|
||||
|
|
@ -24,7 +44,8 @@ KICAD_INTERNAT=$(KICAD_DATA)/internat
|
|||
KICAD_TEMPLATE=$(KICAD_DATA)/template
|
||||
|
||||
else
|
||||
# used by myself (JP Charras) to build a statically linked distribution intalled in /usr/local (with STD_INSTALL = 0)
|
||||
# when STD_INSTALL = 0 or STD_INSTALL = 2
|
||||
# STD_INSTALL = 2 is used by myself (JP Charras) to build a statically linked distribution intalled in /usr/local (with STD_INSTALL = 0)
|
||||
PREFIX = /usr/local/kicad
|
||||
KICAD_BIN = $(PREFIX)/linux
|
||||
KICAD_PLUGINS = $(KICAD_BIN)/plugins
|
||||
|
|
@ -68,17 +89,6 @@ CPPFLAGS += -DUSE_MATCH_LAYER
|
|||
endif
|
||||
|
||||
|
||||
# You must comment or uncomment this line to disable/enable python support
|
||||
#KICAD_PYTHON = 1
|
||||
|
||||
# You must uncomment these lines for static link (or build with "make -f makefile.gtk KICAD_STATIC_LINK=1")
|
||||
# dynamic link is less difficult than static link and is what you would normally want
|
||||
# to use if kicad is running only on your system or one with same level of libraries.
|
||||
ifndef KICAD_PYTHON
|
||||
ifeq ($(STD_INSTALL), 0)
|
||||
KICAD_STATIC_LINK = 1
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(KICAD_STATIC_LINK), 1)
|
||||
LD = gcc
|
||||
|
|
|
|||
|
|
@ -1,281 +0,0 @@
|
|||
/********************************************/
|
||||
/* PCBNEW - Gestion des Options et Reglages */
|
||||
/********************************************/
|
||||
|
||||
/* Fichier reglage.cpp */
|
||||
|
||||
/*
|
||||
Affichage et modifications des parametres de travail de PcbNew
|
||||
Parametres = dimensions des via, pistes, isolements, options...
|
||||
*/
|
||||
|
||||
|
||||
#include "fctsys.h"
|
||||
#include "gr_basic.h"
|
||||
|
||||
#include "common.h"
|
||||
#include "pcbnew.h"
|
||||
#include "pcbplot.h"
|
||||
|
||||
#include "protos.h"
|
||||
|
||||
enum {
|
||||
SAVE_CFG = 1000,
|
||||
DEL_LIB,
|
||||
ADD_LIB,
|
||||
INSERT_LIB,
|
||||
FORMAT_NETLIST
|
||||
};
|
||||
|
||||
/* Routines Locales */
|
||||
|
||||
/*************************************************/
|
||||
/* classe derivee pour la frame de Configuration */
|
||||
/*************************************************/
|
||||
|
||||
class WinEDA_ConfigFrame: public wxDialog
|
||||
{
|
||||
public:
|
||||
|
||||
WinEDA_PcbFrame * m_Parent;
|
||||
wxListBox * ListLibr;
|
||||
int LibModified;
|
||||
|
||||
WinEDA_EnterText * m_TextLibDir;
|
||||
WinEDA_EnterText * m_TextHelpModulesFileName;
|
||||
|
||||
public:
|
||||
// Constructor and destructor
|
||||
WinEDA_ConfigFrame(WinEDA_PcbFrame *parent,const wxPoint& pos);
|
||||
~WinEDA_ConfigFrame() {};
|
||||
|
||||
private:
|
||||
void OnCloseWindow(wxCloseEvent & event);
|
||||
void SaveCfg(wxCommandEvent& event);
|
||||
void LibDelFct(wxCommandEvent& event);
|
||||
void LibInsertFct(wxCommandEvent& event);
|
||||
void SetNewOptions();
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
|
||||
};
|
||||
/* Construction de la table des evenements pour WinEDA_ConfigFrame */
|
||||
BEGIN_EVENT_TABLE(WinEDA_ConfigFrame, wxDialog)
|
||||
EVT_BUTTON(SAVE_CFG, WinEDA_ConfigFrame::SaveCfg)
|
||||
EVT_BUTTON(DEL_LIB, WinEDA_ConfigFrame::LibDelFct)
|
||||
EVT_BUTTON(ADD_LIB, WinEDA_ConfigFrame::LibInsertFct)
|
||||
EVT_BUTTON(INSERT_LIB, WinEDA_ConfigFrame::LibInsertFct)
|
||||
EVT_CLOSE(WinEDA_ConfigFrame::OnCloseWindow)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
|
||||
|
||||
/*****************************************************************/
|
||||
void WinEDA_PcbFrame::InstallConfigFrame(const wxPoint & pos)
|
||||
/*****************************************************************/
|
||||
{
|
||||
WinEDA_ConfigFrame * CfgFrame = new WinEDA_ConfigFrame(this, pos);
|
||||
CfgFrame->ShowModal(); CfgFrame->Destroy();
|
||||
}
|
||||
|
||||
|
||||
/************************************************************/
|
||||
/* Constructeur de WinEDA_ConfigFrame: la fenetre de config */
|
||||
/************************************************************/
|
||||
|
||||
#define X_SIZE 450
|
||||
#define Y_SIZE 380
|
||||
WinEDA_ConfigFrame::WinEDA_ConfigFrame(WinEDA_PcbFrame *parent,
|
||||
const wxPoint& framepos):
|
||||
wxDialog(parent, -1, "", framepos, wxSize(X_SIZE, Y_SIZE),
|
||||
DIALOG_STYLE )
|
||||
{
|
||||
wxPoint pos;
|
||||
wxSize size;
|
||||
wxString title;
|
||||
wxButton * Button;
|
||||
|
||||
m_Parent = parent;
|
||||
SetFont(*g_DialogFont);
|
||||
|
||||
title = _("from ") + EDA_Appl->m_CurrentOptionFile;
|
||||
SetTitle(title);
|
||||
|
||||
LibModified = FALSE;
|
||||
|
||||
/* Creation des boutons de commande */
|
||||
pos.x = 10; pos.y = 5;
|
||||
Button = new wxButton(this, SAVE_CFG, _("Save Cfg"), pos);
|
||||
Button->SetForegroundColour(*wxRED);
|
||||
|
||||
pos.x = 190;
|
||||
Button = new wxButton(this, DEL_LIB, _("Del"), pos);
|
||||
Button->SetForegroundColour(*wxRED);
|
||||
|
||||
pos.x += Button->GetSize().x;
|
||||
Button = new wxButton(this, ADD_LIB, _("Add"), pos );
|
||||
Button->SetForegroundColour(wxColor(0,80,0));
|
||||
|
||||
pos.x += Button->GetSize().x;
|
||||
Button = new wxButton(this, INSERT_LIB, _("Ins"), pos );
|
||||
Button->SetForegroundColour(*wxBLUE);
|
||||
|
||||
pos.x = 190; pos.y += 35;
|
||||
wxStaticText * Msg = new wxStaticText(this, -1, _("Lib Modules:"), pos );
|
||||
pos.y += 15;
|
||||
ListLibr = new wxListBox(this,
|
||||
-1,
|
||||
pos, wxSize(X_SIZE - pos.x -10,190),
|
||||
0,NULL,
|
||||
wxLB_ALWAYS_SB|wxLB_SINGLE);
|
||||
Msg->SetForegroundColour(wxColour(200,0,0) );
|
||||
|
||||
if ( g_LibName_List )
|
||||
{
|
||||
LibNameItem * libnamestruct = g_LibName_List->FirstLib;
|
||||
|
||||
for ( ; libnamestruct != NULL; libnamestruct = libnamestruct->Pnext )
|
||||
{
|
||||
ListLibr->Append(libnamestruct->m_Name);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
wxString text;
|
||||
#define DELTA_VPOS 17
|
||||
size.x = 120; size.y = 90;
|
||||
pos.y = 100; pos.x = 10;
|
||||
new wxStaticBox(this, -1,_("Files ext:"), pos, size);
|
||||
|
||||
pos.x += 5; pos.y += DELTA_VPOS;
|
||||
text = _("Board ext: ") + PcbExtBuffer;
|
||||
new wxStaticText(this, -1,text , pos);
|
||||
|
||||
pos.x += 5; pos.y += DELTA_VPOS;
|
||||
text = _("Cmp ext: ") + NetCmpExtBuffer;
|
||||
new wxStaticText(this, -1,text , pos);
|
||||
|
||||
pos.y += DELTA_VPOS;
|
||||
text = _("Lib ext: ") + LibExtBuffer;
|
||||
new wxStaticText(this, -1,text , pos);
|
||||
|
||||
pos.y += DELTA_VPOS;
|
||||
text = _("Net ext: ") + NetExtBuffer;
|
||||
new wxStaticText(this, -1,text , pos);
|
||||
|
||||
pos.x = 10; pos.y = 260;
|
||||
size.x = X_SIZE - pos.x - 10; size.y = -1;
|
||||
m_TextLibDir = new WinEDA_EnterText(this,
|
||||
_("Lib Modules Dir:"), g_UserLibDirBuffer,
|
||||
pos, size);
|
||||
|
||||
pos.y += m_TextLibDir->GetDimension().y + 25;
|
||||
wxString DocModuleFileName =
|
||||
EDA_Appl->m_EDA_CommonConfig->Read("module_doc_file", "pcbnew/footprints.pdf");
|
||||
m_TextHelpModulesFileName = new WinEDA_EnterText(this,
|
||||
_("Module Doc File:"), DocModuleFileName,
|
||||
pos, size);
|
||||
|
||||
size.x = X_SIZE;
|
||||
size.y = pos.y + m_TextHelpModulesFileName->GetDimension().y + 10;
|
||||
|
||||
SetClientSize(size);
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************/
|
||||
/* Fonctions de base de WinEDA_ConfigFrame: la fenetre de config */
|
||||
/*****************************************************************/
|
||||
|
||||
void WinEDA_ConfigFrame::OnCloseWindow(wxCloseEvent & event)
|
||||
{
|
||||
SetNewOptions();
|
||||
EndModal(0);
|
||||
}
|
||||
|
||||
/********************************************/
|
||||
void WinEDA_ConfigFrame::SetNewOptions()
|
||||
/********************************************/
|
||||
{
|
||||
g_UserLibDirBuffer = m_TextLibDir->GetData();
|
||||
EDA_Appl->m_EDA_CommonConfig->Write("module_doc_file",
|
||||
m_TextHelpModulesFileName->GetData());
|
||||
SetRealLibraryPath("modules");
|
||||
}
|
||||
|
||||
|
||||
/******************************************************/
|
||||
void WinEDA_ConfigFrame::SaveCfg(wxCommandEvent& event)
|
||||
/******************************************************/
|
||||
{
|
||||
SetNewOptions();
|
||||
m_Parent->Update_config(this);
|
||||
}
|
||||
|
||||
|
||||
/********************************************************/
|
||||
void WinEDA_ConfigFrame::LibDelFct(wxCommandEvent& event)
|
||||
/********************************************************/
|
||||
{
|
||||
int ii;
|
||||
wxString LibNameSelected;
|
||||
|
||||
ii = ListLibr->GetSelection();
|
||||
if ( ii < 0 ) return;
|
||||
|
||||
LibNameSelected = ListLibr->GetStringSelection();
|
||||
|
||||
g_LibName_List->RemoveLibName(LibNameSelected);
|
||||
|
||||
ListLibr->Delete(ii);
|
||||
LibModified = TRUE;
|
||||
}
|
||||
|
||||
|
||||
/*************************************************************/
|
||||
void WinEDA_ConfigFrame::LibInsertFct(wxCommandEvent& event)
|
||||
/*************************************************************/
|
||||
/* Insere ou ajoute une librairie a la liste existante:
|
||||
La nouvelle librairie est mise avant (insert) ou apres (ajout)
|
||||
la librairie sélectionnée
|
||||
*/
|
||||
{
|
||||
int ii;
|
||||
wxString fullfilename, ShortLibName;
|
||||
wxString mask ="*";
|
||||
|
||||
ii = ListLibr->GetSelection();
|
||||
if ( ii < 0 ) ii = 0;
|
||||
if( event.GetId() == ADD_LIB)
|
||||
{
|
||||
if( g_LibName_List->FirstLib != NULL ) ii ++; /* Ajout apres selection */
|
||||
}
|
||||
|
||||
SetNewOptions();
|
||||
mask += LibExtBuffer;
|
||||
g_RealLibDirBuffer.Replace("\\","/");
|
||||
|
||||
fullfilename = EDA_FileSelector( _("library files:"),
|
||||
g_RealLibDirBuffer, /* Chemin par defaut */
|
||||
"", /* nom fichier par defaut */
|
||||
LibExtBuffer, /* extension par defaut */
|
||||
mask, /* Masque d'affichage */
|
||||
this,
|
||||
0,
|
||||
TRUE
|
||||
);
|
||||
|
||||
if ( fullfilename == "" ) return;
|
||||
|
||||
ShortLibName =
|
||||
MakeReducedFileName(fullfilename, g_RealLibDirBuffer, LibExtBuffer);
|
||||
|
||||
//Addition ou insertion de la librarire
|
||||
LibModified = TRUE;
|
||||
wxString SList[1];
|
||||
SList[0] =wxString(ShortLibName);
|
||||
if ( g_LibName_List->InsertLibName(SList[0], ii) )
|
||||
ListLibr->InsertItems(1,SList,ii);
|
||||
else DisplayError(this, _("Library exists! No Change"));
|
||||
}
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
release version:
|
||||
09 jul 2007
|
||||
09 nov 2007
|
||||
files (.zip,.tgz):
|
||||
kicad-2007-07-09
|
||||
kicad-2007-11-09
|
||||
|
|
|
|||
Loading…
Reference in New Issue