Commit 44c01057 authored by CHARRAS's avatar CHARRAS
Browse files

some enhancements. See changelog

parent 2f1b4cd1
Loading
Loading
Loading
Loading
+7 −1
Original line number Original line Diff line number Diff line
/* XPM */
/* XPM */
static const char * add_tracks_xpm[] = {
#ifndef XPMMAIN
extern const char *add_tracks_xpm[];

#else
const char * add_tracks_xpm[] = {
"16 16 16 1",
"16 16 16 1",
" 	c None",
" 	c None",
".	c #007D00",
".	c #007D00",
@@ -33,3 +37,5 @@ static const char * add_tracks_xpm[] = {
" ;;;;;)         ",
" ;;;;;)         ",
"  ,',)          ",
"  ,',)          ",
"                "};
"                "};

#endif
+39 −0
Original line number Original line Diff line number Diff line
/* XPM */
#ifndef XPMMAIN
extern const char *auto_track_width_xpm[];

#else
const char * auto_track_width_xpm[] = {
"16 16 14 1",
" 	c None",
",	c #008080",
".	c #00E000",
"+	c #006100",
"@	c #004400",
"#	c #007800",
"$	c #007B00",
"%	c #004000",
"&	c #007C00",
"*	c #006500",
"=	c #007A00",
"-	c #004600",
"x	c #FF2D2D",
"o	c #0000FF",
"                ",
"........+       ",
".........+      ",
"      @..#      ",
"       $.%  o o ",
"       &..*  o  ",
"    xxxx..=  o  ",
"   x xxx..-  o  ",
"  x x   ........",
" x x     .......",
"x x   ,      o  ",
"x x ,,       o  ",
"x x,,,,,,,,,,o  ",
"x x ,,       o  ",
"x x   ,     o o ",
"x x             "};

#endif
+6 −1
Original line number Original line Diff line number Diff line
/* XPM */ 
/* XPM */ 
static const char * width_segment_xpm[] = {
#ifndef XPMMAIN
extern const char *width_segment_xpm[];

#else
const char * width_segment_xpm[] = {
"16 16 3 1",
"16 16 3 1",
" 	c None",
" 	c None",
"!	c black",
"!	c black",
@@ -20,3 +24,4 @@ static const char * width_segment_xpm[] = {
"   !            ",
"   !            ",
"   !            ",
"   !            ",
"                "};
"                "};
#endif
+10 −57
Original line number Original line Diff line number Diff line
Can somebody please come to my rescue on this one:

This was posted to the developer's list.   It would be nice to get an 
apology or at least a link to the posting from which he launches such an attack:




Dick, enough of this whining. The article on gnu.org is more than an opinion
piece - unless
you really don't know what/who gnu.org is. While I and others here do appreciate
contributions made by all involved, your contributions do not entitle you to the
rest of the
code base. The GPL license is not revocable. You can take your lines of the
code (and only
just what you wrote) and do what you want, but you can't take Jean Pierre's
code, even if
you have modified it, without violating the GPL.

I'm hereby asking Jean Pierre if he could please make it clear to this list if
he has ANY
intent of turning this package away from GPL for Dick or anyone else. I think
all involved
should know here and now if this is going to remain an open GPL project or not.
I don't
think anyone else here is interested in seeing kicad become a proprietary
package.

If Dick thinks he can just take the entire code base as his, I'm sure that FSF
would help
with the legal costs of stopping him. (To donate to FSF see
http://www.fsf.org/associate/support_freedom/donate )

FSF has stepped up to the plate before and stopped people from appropriating GPL
software
for their own ends. The cost of IP litigation is not cheap, so I would recommend
Dick to
talk to an IP attorney before doing something stupid.


----------------------------------------------------------------
Karl Schmidt EMail Karl@...
Transtronics, Inc. WEB http://xtronics.com
3209 West 9th Street Ph (785) 841-3089
Lawrence, KS 66049 FAX (785) 841-0434

A clear conscience is usually the sign of a bad memory.

----------------------------------------------------------------












Change Log for Kicad
Change Log for Kicad
@@ -63,6 +6,16 @@ Started 2007-June-11
Please add newer entries at the top, list the date and your name with
Please add newer entries at the top, list the date and your name with
email address.
email address.


2008-Jan-28 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
+pcbnew:
	- Better criteria to find starting poind in zone filling: the filling alg. uses
	pads, vias and track ends to find where start the filling.
	- Added a tool + option in popup menu in track mode (select track width):
	when creating a track, if activated: if we starts on an existing track,
	the new track takes the width of the existing track




2008-Jan-27 UPDATE   Dick Hollenbeck <dick@softplc.com>
2008-Jan-27 UPDATE   Dick Hollenbeck <dick@softplc.com>
================================================================================
================================================================================

contrib_makefiles.txt

deleted100644 → 0
+0 −309
Original line number Original line Diff line number Diff line
libs.dynamic

CC = `wx-config --cc`
# Note: at least on Debian using gcc gives a smaller binary than using:
# `wx-config --ld`
LD = gcc

SRCSUFF = .cpp
OBJSUFF = .o
FINAL = 1

WXPATH = `wx-config --prefix`/lib
PREFIX_WX_LIBS = `wx-config --basename`
SUFFIX_WX_LIBGL = _gl-$(LIBVERSION)

LIBSTDC = -lstdc++
LIBVERSION=`wx-config --release`
WXSYSLIB= `wx-config --libs`

# attention  l'ordre des libairies
LIBS = -L/usr/local/lib -L/usr/X11R6/lib\
	$(EXTRALIBS) $(WXSYSLIB)\
	$(LIBSTDC)

LIBS3D = -l$(PREFIX_WX_LIBS)$(SUFFIX_WX_LIBGL) -lGL -lGLU

# Sub-projects
KICAD_SUBDIRS = common 3d-viewer eeschema pcbnew cvpcb kicad gerbview wxhtml
# How to invoke make
MAKE := $(MAKE) -f makefile.gtk
# File with the libraries definitions
LIBSDEF = libs.dynamic
# Prefix, can be from command line
ifneq ($(strip $(prefix)),)
  IPREFIX=$(prefix)
else
  IPREFIX=/usr/local/kicad/linux
endif
# Install tool, can be from command line
ifeq ($(INSTALL),)
  INSTALL=install
endif
# C Flags, can be from command line
ifeq ($(CFLAGS),)
  CFLAGS=-Wall -O2
  #CFLAGS=-Wall -Werror -g3
endif
CFLAGS:=$(CFLAGS) `wx-config --cxxflags`
# Linker flags (strip)
LDFLAGS = -s
export

.PHONY: $(KICAD_SUBDIRS)

all: $(KICAD_SUBDIRS)

common:
	cd $@ ; $(MAKE)

3d-viewer:
	cd $@ ; $(MAKE)

eeschema:
	cd $@ ; $(MAKE)

pcbnew:
	cd $@ ; $(MAKE)

cvpcb:
	cd $@ ; $(MAKE)

kicad:
	cd $@ ; $(MAKE)

gerbview:
	cd $@ ; $(MAKE)

wxhtml:
	cd $@ ; $(MAKE)

install:
	@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE) install); done

clean:
	@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE) clean); done

3d-viewer/makefile.gtk
## Makefile for 3d-viewer.a ( wxGTK - LINUX )

# Compiler flags.
CPPFLAGS =  $(CFLAGS) -DPCBNEW  -I../pcbnew -I ../include -I../common

include ../$(LIBSDEF)

TARGET = 3d-viewer

all: $(TARGET).a

include makefile.include

$(TARGET).a: $(OBJECTS3D) makefile.gtk makefile.include
	rm -f $@
	ar -rv $@ $(OBJECTS3D)
	ranlib $@

clean:
	-rm *.o *.a *~ .*~ core *.bak *.exe *.obj 2> /dev/null

# No install target

## Makefile for common.a

# Compiler flags.
CPPFLAGS = $(CFLAGS) -I./ -I../include
EDACPPFLAGS = $(CPPFLAGS)

all: common.a

include makefile.include

CPPFLAGS += $(EXTRACPPFLAGS)
EDACPPFLAGS = $(CPPFLAGS)


common.a: $(OBJECTS) makefile.gtk makefile.include
	rm -f $@
	ar -rv $@ $(OBJECTS)
	ranlib $@


clean:
	-rm *.o *.a *~ .*~ core *.bak *.exe *.obj 2> /dev/null

# No install target

# File:		makefile

# Compiler flags.
CPPFLAGS = $(CFLAGS)
EDACPPFLAGS = $(CPPFLAGS)

include ../$(LIBSDEF)


TARGET = cvpcb

all: $(TARGET)

include makefile.include

CPPFLAGS += $(EXTRACPPFLAGS)
EDACPPFLAGS = $(CPPFLAGS)


$(TARGET):	$(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../$(LIBSDEF) $(LIBVIEWER3D)
	$(LD) $(OBJECTS) $(LDFLAGS)  $(LIBS)  $(LIBVIEWER3D)  $(LIBS3D) -o $(TARGET)

install:
	$(INSTALL) -d -m 0755 $(IPREFIX)
	$(INSTALL) -m 0755 $(TARGET) $(IPREFIX)

clean:
	-rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null

## Makefile for eeschema

include ../$(LIBSDEF)

TARGET = eeschema

CPPFLAGS = $(CFLAGS)

all: $(TARGET)

include makefile.include

CPPFLAGS += $(EXTRACPPFLAGS)
EDACPPFLAGS = $(CPPFLAGS)

$(TARGET):  $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../$(LIBSDEF)
	$(LD) $(OBJECTS) $(LDFLAGS)  $(LIBS) -o $(TARGET)

install:
	$(INSTALL) -d -m 0755 $(IPREFIX)
	$(INSTALL) -m 0755 $(TARGET) $(IPREFIX)

clean:
	-rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null


## Makefile for GERBVIEW et wxGTK

# Compiler flags.
CPPFLAGS = $(CFLAGS)

EXTRALIBS = ../common/common.a
include ../$(LIBSDEF)


TARGET = gerbview

all: $(TARGET)

include makefile.include

CPPFLAGS += $(EXTRACPPFLAGS)
EDACPPFLAGS = $(CPPFLAGS)


$(TARGET):  $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../$(LIBSDEF)
		$(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET)

install:
	$(INSTALL) -d -m 0755 $(IPREFIX)
	$(INSTALL) -m 0755 $(TARGET) $(IPREFIX)

clean:
	-rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null

# File:		makefile for kicad, wxGTK

# Compiler flags.
CPPFLAGS = $(CFLAGS)

include ../$(LIBSDEF)

TARGET = kicad

all: $(TARGET)

include makefile.include

CPPFLAGS += $(EXTRACPPFLAGS)
EDACPPFLAGS = $(CPPFLAGS)


$(TARGET):	$(OBJECTS) makefile.gtk $(EXTRALIBS) ../$(LIBSDEF)
	$(LD) $(OBJECTS) $(LDFLAGS)  $(LIBS) -o $(TARGET)

install:
	$(INSTALL) -d -m 0755 $(IPREFIX)
	$(INSTALL) -m 0755 $(TARGET) $(IPREFIX)

clean:
	-rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null

## Makefile for PCBNEW et wxGTK

# Compiler flags.
CPPFLAGS = $(CFLAGS)

include ../$(LIBSDEF)

TARGET = pcbnew

all: $(TARGET)

include makefile.include

CPPFLAGS += $(EXTRACPPFLAGS)
EDACPPFLAGS = $(CPPFLAGS)

$(TARGET):  $(OBJECTS) makefile.gtk  makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../$(LIBSDEF)
		$(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) $(LIBVIEWER3D) $(LIBS3D)\
		-o $(TARGET)

install:
	$(INSTALL) -d -m 0755 $(IPREFIX)
	$(INSTALL) -m 0755 $(TARGET) $(IPREFIX)

clean:
	-rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null

########################################################################
########################################################################

# Compiler flags.
CPPFLAGS =  $(CFLAGS) -I./ -I../include -I../common

EXTRALIBS =

include ../$(LIBSDEF)

TARGET = wxhtml

OBJDIR =
OBJSUFF = o

.SUFFIXES:	.cpp .h .o .cc
.cpp.o :
	$(CC)  -c $< -o $(<:.cpp=.o) $(CPPFLAGS)


DEPEND =


OBJECTS = $(TARGET).o helpfrm.o


$(TARGET): $(OBJECTS) makefile.gtk ../common/common.a ../$(LIBSDEF)
	$(LD) $(OBJECTS) $(LDFLAGS)  $(LIBS) -o $(TARGET)

install:
	$(INSTALL) -d -m 0755 $(IPREFIX)
	$(INSTALL) -m 0755 $(TARGET) $(IPREFIX)

clean:
	-rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null
Loading