Upstream merge. (2fd2c1dc) · Commits · Elphel / kicad-source-mirror

AUTHORS.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -29,17 +29,17 @@ Igor Plyatov <plyatov[at]gmail.com>
		Fabrizio Tappero <fabrizio-dot-tappero[at]gmail-dot-com>

		== Translators
		Czech (CZ) Martin Kratoška <martin[at]ok1rr-dot-com>
		Czech (CZ) Martin KratoÅ¡ka <martin[at]ok1rr-dot-com>
		Dutch (NL) Jerry Jacobs <xor.gate.engineering[at]gmail-dot-com>
		Finnish (FI) Vesa Solonen <vesa.solonen[at]hut-dot-fi>
		French (FR) Jean-Pierre Charras <jean-pierre.charras[at]inpg-dot-fr>
		Polish (PL) Mateusz Skowroski <skowri[at]gmail-dot-com>
		Polish (PL) Mateusz Skowro¿ski <skowri[at]gmail-dot-com>
		Polish (PL) Kerusey Karyu <keruseykaryu@o2.pl>
		Portuguese (PT) Renie Marquet <reniemarquet[at]uol-dot-com-dot-br>"
		Russian (RU) Igor Plyatov <plyatov[at]gmail-dot-com>
		Russian (RU) Andrey Fedorushkov <andrf@mail.ru>
		Spanish (ES) Pedro Martin del Valle <pkicad[at]yahoo-dot-es>
		Spanish (ES) Iigo Zuluaga <inigo_zuluaga[at]yahoo-dot-es>
		Spanish (ES) Iñigo Zuluaga <inigo_zuluaga[at]yahoo-dot-es>
		German (DE) Rafael Sokolowski <Rafael.Sokolowski[at]web-dot-de
		Japanese (JA) Kenta Yonekura <midpika@hotmail.com>
		Japanese (JA) yoneken <midpika@hotmail.com>
		@@ -47,7 +47,7 @@ Japanese (JA) yoneken <midpika@hotmail.com>
		Remy Halvick, David Briscoe, Dominique Laigle, Paul Burke

		== Programm credits for icons and others
		Icons by Iigo Zuluagaz <inigo_zuluaga[at]yahoo-dot-es>
		Icons by Iñigo Zuluagaz <inigo_zuluaga[at]yahoo-dot-es>
		New Icons by Fabrizio Tappero <fabrizio-dot-tappero[at]gmail-dot-com>
		3D modules by Renie Marquet <reniemarquet[at]uol.com-dot-br>
		3D modules by Christophe Boschat <nox454[at]hotmail-dot-fr>

CMakeLists.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -390,6 +390,7 @@ add_subdirectory(kicad)
		add_subdirectory(pcbnew)
		add_subdirectory(pcbnew/pcad2kicadpcb_plugin)
		add_subdirectory(polygon)
		add_subdirectory(pagelayout_editor)
		add_subdirectory(potrace)
		add_subdirectory(bitmap2component)
		add_subdirectory(pcb_calculator)
		@@ -407,6 +408,7 @@ add_dependencies( pcbcommon boost )
		add_dependencies( 3d-viewer boost )
		add_dependencies( pcad2kicadpcb boost )
		add_dependencies( polygon boost )
		add_dependencies( pl_editor boost )


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

Doxyfile

+3 −2

Original line number	Diff line number	Diff line
		@@ -668,6 +668,7 @@ INPUT = kicad \
		3d-viewer \
		common \
		gerbview \
		pagelayout_editor \
		include \
		polygon \
		potrace
		@@ -703,8 +704,8 @@ RECURSIVE = YES
		# Note that relative paths are relative to the directory from which doxygen is
		# run.

		EXCLUDE = include/boost \
		polygon/kbool
		EXCLUDE = include/boost


		# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
		# directories that are symbolic links (a Unix file system feature) are excluded

bitmaps_png/CMakeLists.txt

+7 −37

Original line number	Diff line number	Diff line
		@@ -43,9 +43,6 @@
		#
		# 1) inkscape - command line mode is used, must be on your PATH
		# 2) pngcrush - this program must be on your PATH
		# 3) Under Windows only:
		# dos2unix - to convert End Of Lines to unix EOL (CRLF to LF)
		# this program must be on your PATH
		#

		# lower case is used for local variables, uppercase for global variables
		@@ -71,21 +68,8 @@ option( MAINTAIN_PNGS
		"Set to true if you are a PNG maintainer and have the required tools given in the bitmaps_png/CMakeLists.txt file (default OFF)."
		OFF)


		# Used Only to maintain PNG files (and therefore to recreate .cpp files)
		# The png2cpp creates files with native End of Line format.
		# To avoid mixed EOF formats in these .cpp files, it is good to
		# convert them in Unix EOL format (LF)
		# Under Windows, the well known dos2unix.exe does the conversion
		# It is installed with MinGW and MSYS.
		# It is very easy to install (just an executable to copy in a known path) if it is missing

		if( WIN32 )
		set( CONVERT_EOL true )
		set( eol2unix_converter dos2unix )
		else()
		set( CONVERT_EOL false )
		endif( WIN32 )

		include_directories(BEFORE ${INC_BEFORE})
		include_directories(
		@@ -431,6 +415,12 @@ set( BMAPS_MID
		pad
		pad_dimensions
		pads_mask_layers
		pagelayout_load
		pagelayout_load_default
		pagelayout_new
		pagelayout_recent
		pagelayout_normal_view_mode
		pagelayout_special_view_mode
		palette
		part_properties
		paste
		@@ -555,6 +545,7 @@ set( BMAPS_BIG
		icon_pcbcalculator
		libedit_icon
		viewlibs_icon
		icon_pagelayout_editor
		)


		@@ -596,25 +587,6 @@ endfunction()

		# Function png2cpp
		# converts a single .png to .cpp
		if( CONVERT_EOL )
		function( png2cpp inputFile outFile )
		add_custom_command(
		OUTPUT ${outFile}

		COMMAND rm -f ${outFile}.tmp
		COMMAND ${CMAKE_COMMAND} -DinputFile=${inputFile} -DoutCppFile=${outFile}
		-P ${CMAKE_MODULE_PATH}/PNG2cpp.cmake

		DEPENDS ${inputFile} ${CMAKE_MODULE_PATH}/PNG2cpp.cmake

		POST_BUILD
		COMMAND ${eol2unix_EXECUTABLE} ${outFile}

		COMMENT "Creating (with unix eol) ${outFile}"
		)
		endfunction()

		else( CONVERT_EOL )
		function( png2cpp inputFile outFile )
		add_custom_command(
		OUTPUT ${outFile}
		@@ -627,8 +599,6 @@ function( png2cpp inputFile outFile )
		)
		endfunction()

		endif(CONVERT_EOL)


		# Function bitmap_dir
		# converts all the basenames in bmapList found in hardcoded 'sources' dir

bitmaps_png/cpp_26/icon_gerbview_small.cpp

+118 −118

File changed.

Preview size limit exceeded, changes collapsed.

Admin message