diff -ru piklab-0.15.8/Changelog piklab-0.15.9/Changelog
--- piklab-0.15.8/Changelog 2010-05-01 13:21:15.000000000 +0200
+++ piklab-0.15.9/Changelog 2010-05-02 18:41:21.000000000 +0200
@@ -1,3 +1,7 @@
+0.15.9 (2 May 2010)
+* added icd2 programmer support for 18F88X [requested by Lorenzo Marcantonio]
+* added icd2 programmer support for 12F609/615 16F610
+
0.15.8 (30 April 2010)
* added support for 18F23K20/18F26K20 [fix by Florian Hühn]
* added allowance for packages with multiple NC pins [fix by Florian Hühn]
diff -ru piklab-0.15.8/CMakeLists.txt piklab-0.15.9/CMakeLists.txt
--- piklab-0.15.8/CMakeLists.txt 2010-05-01 17:33:10.000000000 +0200
+++ piklab-0.15.9/CMakeLists.txt 2010-05-03 00:03:50.000000000 +0200
@@ -1,18 +1,27 @@
-#set(LIBUSB_VERSION "1.12.1") # for win32 platform
-
project(piklab)
-set(VERSION "0.15.8")
-set(CMAKE_BUILD_TYPE Debug)
+set(VERSION "0.15.9")
+cmake_minimum_required(VERSION 2.4)
+if(COMMAND cmake_policy)
+ cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+if(WIN32)
+ set(CMAKE_VERBOSE_MAKEFILE ON)
+ set(CMAKE_BUILD_TYPE Release)
+ set(QT_ONLY 1)
+else(WIN32)
+ set(CMAKE_BUILD_TYPE Debug)
+endif(WIN32)
+
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src)
if(QT_ONLY)
find_package(Qt4 REQUIRED)
-#SET(QT_DONT_USE_QTGUI 1)
- SET(QT_USE_QTXML 1)
- SET(QT_USE_QT3SUPPORT 1)
- INCLUDE(${QT_USE_FILE})
+ set(QT_USE_QTXML 1)
+ set(QT_USE_QT3SUPPORT 1)
+ include(${QT_USE_FILE})
add_definitions(-DNO_KDE)
set(KDE_LIBS nokde)
set(GUI_LIBS ${QT_LIBRARIES})
@@ -34,22 +43,36 @@
endmacro(automoc)
endif(QT_ONLY)
-find_package(LIBUSB REQUIRED)
-include_directories(${LIBUSB_INCLUDE_DIRS})
+if(WIN32)
+ set(HAVE_USB 1)
+ set(LIBUSB_VERSION "1.12.1")
+ set(LIBUSB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libusb/libusb-win32-device-bin-0.1.12.2)
+ set(LIBUSB_INCLUDE_DIRS ${LIBUSB_DIR}/include)
+ set(LIBUSB_LIBRARIES ${LIBUSB_DIR}/lib/gcc/libusb.a)
+ include_directories(${LIBUSB_INCLUDE_DIRS})
+else(WIN32)
+ find_package(LIBUSB REQUIRED)
+ include_directories(${LIBUSB_INCLUDE_DIRS})
-find_package(Curses)
-include_directories(${CURSES_INCLUDE_DIR})
+ find_package(Curses)
+ include_directories(${CURSES_INCLUDE_DIR})
-find_package(Readline)
-include_directories(${LIBREADLINE_INCLUDE_DIRS})
+ find_package(Readline)
+ include_directories(${LIBREADLINE_INCLUDE_DIRS})
-find_package(ParallelPortSupport)
+ find_package(ParallelPortSupport)
+endif(WIN32)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
add_subdirectory(src)
-add_subdirectory(po)
-add_subdirectory(man)
-add_subdirectory(doc)
-install(FILES README Changelog COPYING DESTINATION share/doc/piklab)
\ Pas de fin de ligne à la fin du fichier.
+if(NOT QT_ONLY)
+ add_subdirectory(doc)
+endif(NOT QT_ONLY)
+
+if(NOT WIN32)
+ add_subdirectory(po)
+ add_subdirectory(man)
+ install(FILES README Changelog COPYING DESTINATION share/doc/piklab)
+endif(NOT WIN32)
\ Pas de fin de ligne à la fin du fichier.
diff -ru piklab-0.15.8/piklab-prog-qt4.spec piklab-0.15.9/piklab-prog-qt4.spec
--- piklab-0.15.8/piklab-prog-qt4.spec 2010-05-02 14:40:11.000000000 +0200
+++ piklab-0.15.9/piklab-prog-qt4.spec 2010-05-02 16:12:17.000000000 +0200
@@ -35,26 +35,23 @@
export LD_LIBRARY_PATH=$QTDIR/%{_lib}:$LD_LIBRARY_PATH
export PATH=$QTDIR/bin:$PATH
export QTLIB=$QTDIR/%{_lib}
-cd %{buildroot}
cmake -DQT_ONLY=1 -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr/.
-%make -j1
+%make
%install
rm -rf %{buildroot}
%makeinstall
-%find_lang %{name}
+%find_lang piklab
%clean
rm -rf %{buildroot}
-%files -f %{name}.lang
+%files -f piklab.lang
%defattr(755,root,root)
%{_bindir}/*
%defattr(644,root,root,755)
-%{_datadir}/apps/%name
%{_mandir}/man1/*
-%{_docdir}/HTML/en/%name
-%{_docdir}/%name/*
+%{_docdir}/piklab/*
%changelog
* Sat May 1 2010 Nicolas Hadacek <hadacek@kde.org> 0.15.8-1mdv2008.0
diff -ru piklab-0.15.8/piklab.spec piklab-0.15.9/piklab.spec
--- piklab-0.15.8/piklab.spec 2010-05-01 17:33:10.000000000 +0200
+++ piklab-0.15.9/piklab.spec 2010-05-02 16:12:17.000000000 +0200
@@ -26,7 +26,7 @@
programmers and several direct programmers are supported.
%prep
-%setup -q -n %{name}-%{version}
+%setup -q -n piklab-%{version}
%build
cmake -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr/ .
@@ -36,10 +36,10 @@
rm -rf %{buildroot}
%makeinstall
mkdir -p %{buildroot}%{_iconsdir} %{buildroot}%{_miconsdir} %{buildroot}%{_liconsdir}
-convert -resize 16x16 piklab.xpm %{buildroot}%{_miconsdir}/%name.png
-convert -resize 32x32 piklab.xpm %{buildroot}%{_iconsdir}/%name.png
-convert -resize 48x48 piklab.xpm %{buildroot}%{_liconsdir}/%name.png
-%find_lang %{name}
+convert -resize 16x16 piklab.xpm %{buildroot}%{_miconsdir}/piklab.png
+convert -resize 32x32 piklab.xpm %{buildroot}%{_iconsdir}/piklab.png
+convert -resize 48x48 piklab.xpm %{buildroot}%{_liconsdir}/piklab.png
+%find_lang piklab
%clean
rm -rf %{buildroot}
@@ -50,21 +50,21 @@
%postun
%{clean_menus}
-%files -f %{name}.lang
+%files -f piklab.lang
%defattr(755,root,root)
%{_bindir}/*
%defattr(644,root,root,755)
-%{_datadir}/apps/%name
+%{_datadir}/apps/piklab
%{_datadir}/applications/kde/piklab.desktop
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/mimelnk/application/x-piklab.desktop
%{_datadir}/apps/katepart/syntax/*
%{_mandir}/man1/*
-%{_docdir}/HTML/en/%name
-%{_docdir}/%name/*
-%{_miconsdir}/%name.png
-%{_iconsdir}/%name.png
-%{_liconsdir}/%name.png
+%{_docdir}/HTML/en/piklab
+%{_docdir}/piklab/*
+%{_miconsdir}/piklab.png
+%{_iconsdir}/piklab.png
+%{_liconsdir}/piklab.png
%changelog
* Sat May 1 2010 Nicolas Hadacek <hadacek@kde.org> 0.15.8-1mdv2008.0
diff -ru piklab-0.15.8/src/coff/base/CMakeLists.txt piklab-0.15.9/src/coff/base/CMakeLists.txt
--- piklab-0.15.8/src/coff/base/CMakeLists.txt 2010-05-01 13:21:14.000000000 +0200
+++ piklab-0.15.9/src/coff/base/CMakeLists.txt 2010-05-02 16:56:17.000000000 +0200
@@ -2,7 +2,7 @@
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/coff_data.cpp
- COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_coff_parser
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_coff_parser ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_coff_parser coff.xml
)
diff -ru piklab-0.15.8/src/coff/xml/CMakeLists.txt piklab-0.15.9/src/coff/xml/CMakeLists.txt
--- piklab-0.15.8/src/coff/xml/CMakeLists.txt 2010-05-01 13:21:14.000000000 +0200
+++ piklab-0.15.9/src/coff/xml/CMakeLists.txt 2010-05-02 18:32:53.000000000 +0200
@@ -4,8 +4,12 @@
gpprocessor.cpp
xml_coff_parser.cpp
)
-add_executable(xml_coff_parser ${xml_coff_parser_SRCS})
+
automoc(${xml_coff_parser_SRCS})
-target_link_libraries(xml_coff_parser ${GUI_LIBS} devicelistnoui pic
+
+add_executable(xml_coff_parser ${xml_coff_parser_SRCS})
+
+target_link_libraries(xml_coff_parser devicelistnoui pic
picbase picxml mem24 mem24base mem24xml
- xmltodata devicebase common)
+ xmltodata devicebase common ${GUI_LIBS}
+)
diff -ru piklab-0.15.8/src/common/global/CMakeLists.txt piklab-0.15.9/src/common/global/CMakeLists.txt
--- piklab-0.15.8/src/common/global/CMakeLists.txt 2010-05-01 13:21:05.000000000 +0200
+++ piklab-0.15.9/src/common/global/CMakeLists.txt 2010-05-02 16:49:32.000000000 +0200
@@ -1,15 +1,17 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-ADD_CUSTOM_COMMAND(
+if(NOT WIN32)
+ ADD_CUSTOM_COMMAND(
OUTPUT dummy
COMMAND ${CMAKE_COMMAND} ARGS -E echo "Forcing svn_revision.h generation"
-)
-ADD_CUSTOM_COMMAND(
+ )
+ ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/svn_revision.h
DEPENDS dummy
COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_CURRENT_SOURCE_DIR}/svn_revision.sh
-)
-ADD_CUSTOM_TARGET(generate DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/svn_revision.h)
+ )
+ ADD_CUSTOM_TARGET(generate DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/svn_revision.h)
+endif(NOT WIN32)
SET(global_STAT_SRCS
about.cpp
diff -ru piklab-0.15.8/src/common/gui/misc_gui.h piklab-0.15.9/src/common/gui/misc_gui.h
--- piklab-0.15.8/src/common/gui/misc_gui.h 2010-05-01 13:21:05.000000000 +0200
+++ piklab-0.15.9/src/common/gui/misc_gui.h 2010-05-02 16:49:32.000000000 +0200
@@ -16,6 +16,10 @@
#include "common/common/number.h"
#include "global_ui.h"
+#ifdef Q_WS_WIN
+# undef MessageBox
+#endif
+
#ifdef NO_KDE
# include "common/nokde_gui/nokde_misc_ui.h"
#else
diff -ru piklab-0.15.8/src/common/nokde/CMakeLists.txt piklab-0.15.9/src/common/nokde/CMakeLists.txt
--- piklab-0.15.8/src/common/nokde/CMakeLists.txt 2010-05-01 13:21:05.000000000 +0200
+++ piklab-0.15.9/src/common/nokde/CMakeLists.txt 2010-05-02 18:32:53.000000000 +0200
@@ -1,6 +1,6 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-SET(nokde_STAT_SRCS
+set(nokde_STAT_SRCS
nokde_kaboutdata.cpp
nokde_kcmdlineargs.cpp
nokde_klocale.cpp
@@ -8,6 +8,12 @@
nokde_purl.cpp
)
+if(WIN32)
+ set(nokde_STAT_SRCS ${nokde_STAT_SRCS}
+ win32_utils.c
+ )
+endif(WIN32)
+
automoc(${nokde_STAT_SRCS})
add_library(nokde STATIC ${nokde_STAT_SRCS})
diff -ru piklab-0.15.8/src/devices/mem24/xml/CMakeLists.txt piklab-0.15.9/src/devices/mem24/xml/CMakeLists.txt
--- piklab-0.15.8/src/devices/mem24/xml/CMakeLists.txt 2010-05-01 13:20:56.000000000 +0200
+++ piklab-0.15.9/src/devices/mem24/xml/CMakeLists.txt 2010-05-02 18:32:53.000000000 +0200
@@ -3,6 +3,8 @@
SET(mem24_xml_to_data_SRCS
mem24_xml_to_data.cpp
)
+
automoc(${mem24_xml_to_data_SRCS})
+
add_executable(mem24_xml_to_data ${mem24_xml_to_data_SRCS})
-target_link_libraries(mem24_xml_to_data ${GUI_LIBS} mem24base xmltodata devicebase common)
+target_link_libraries(mem24_xml_to_data mem24base xmltodata devicebase common ${GUI_LIBS})
diff -ru piklab-0.15.8/src/devices/mem24/xml_data/CMakeLists.txt piklab-0.15.9/src/devices/mem24/xml_data/CMakeLists.txt
--- piklab-0.15.8/src/devices/mem24/xml_data/CMakeLists.txt 2010-05-01 13:20:57.000000000 +0200
+++ piklab-0.15.9/src/devices/mem24/xml_data/CMakeLists.txt 2010-05-02 16:56:17.000000000 +0200
@@ -3,7 +3,7 @@
FILE(GLOB DEVICE_XML_DEPEND RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*.xml")
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/mem24_data.cpp
- COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_CURRENT_BINARY_DIR}/../xml/mem24_xml_to_data
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../xml/mem24_xml_to_data ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../xml/mem24_xml_to_data ${DEVICE_XML_DEPEND}
)
diff -ru piklab-0.15.8/src/devices/pic/xml/CMakeLists.txt piklab-0.15.9/src/devices/pic/xml/CMakeLists.txt
--- piklab-0.15.8/src/devices/pic/xml/CMakeLists.txt 2010-05-01 13:20:57.000000000 +0200
+++ piklab-0.15.9/src/devices/pic/xml/CMakeLists.txt 2010-05-02 16:49:32.000000000 +0200
@@ -3,6 +3,8 @@
SET(pic_xml_to_data_SRCS
pic_xml_to_data.cpp
)
-add_executable(pic_xml_to_data ${pic_xml_to_data_SRCS})
+
automoc(${pic_xml_to_data_SRCS})
-target_link_libraries(pic_xml_to_data ${GUI_LIBS} picbase xmltodata devicebase common)
+
+add_executable(pic_xml_to_data ${pic_xml_to_data_SRCS})
+target_link_libraries(pic_xml_to_data picbase xmltodata devicebase common ${GUI_LIBS})
diff -ru piklab-0.15.8/src/devices/pic/xml_data/CMakeLists.txt piklab-0.15.9/src/devices/pic/xml_data/CMakeLists.txt
--- piklab-0.15.8/src/devices/pic/xml_data/CMakeLists.txt 2010-05-01 13:21:04.000000000 +0200
+++ piklab-0.15.9/src/devices/pic/xml_data/CMakeLists.txt 2010-05-02 16:56:17.000000000 +0200
@@ -5,7 +5,7 @@
FILE(GLOB REGISTER_XML_DEPEND RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/registers/*.xml")
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/pic_data.cpp
- COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_CURRENT_BINARY_DIR}/../xml/pic_xml_to_data
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../xml/pic_xml_to_data ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../xml/pic_xml_to_data ${DEVICE_XML_DEPEND} ${CMACRO_XML_DEPEND} ${REGISTER_XML_DEPEND}
)
diff -ru piklab-0.15.8/src/piklab-coff/CMakeLists.txt piklab-0.15.9/src/piklab-coff/CMakeLists.txt
--- piklab-0.15.8/src/piklab-coff/CMakeLists.txt 2010-05-01 13:21:14.000000000 +0200
+++ piklab-0.15.9/src/piklab-coff/CMakeLists.txt 2010-05-02 18:32:53.000000000 +0200
@@ -3,12 +3,18 @@
SET(piklab-coff_SRCS
main.cpp
)
+
automoc(${piklab-coff_SRCS})
+
add_executable(piklab-coff ${piklab-coff_SRCS})
-target_link_libraries(piklab-coff ${GUI_LIBS} ${CURSES_LIBRARIES}
- ${LIBREADLINE_LIBRARIES} ${LIBHISTORY_LIBRARIES}
+
+target_link_libraries(piklab-coff
cli coff global
devicelistnoui pic picbase picxml mem24 mem24base mem24xml
- devicebase ${KDE_LIBS} common)
+ devicebase ${KDE_LIBS} common
+ ${GUI_LIBS}
+ ${CURSES_LIBRARIES}
+ ${LIBREADLINE_LIBRARIES} ${LIBHISTORY_LIBRARIES}
+)
install(TARGETS piklab-coff DESTINATION bin)
diff -ru piklab-0.15.8/src/piklab-hex/CMakeLists.txt piklab-0.15.9/src/piklab-hex/CMakeLists.txt
--- piklab-0.15.8/src/piklab-hex/CMakeLists.txt 2010-05-01 13:21:04.000000000 +0200
+++ piklab-0.15.9/src/piklab-hex/CMakeLists.txt 2010-05-02 18:32:53.000000000 +0200
@@ -3,12 +3,17 @@
SET(piklab-hex_SRCS
main.cpp
)
+
automoc(${piklab-hex_SRCS})
+
add_executable(piklab-hex ${piklab-hex_SRCS})
-target_link_libraries(piklab-hex ${GUI_LIBS} ${CURSES_LIBRARIES}
- ${LIBREADLINE_LIBRARIES} ${LIBHISTORY_LIBRARIES}
+target_link_libraries(piklab-hex
cli global devicelistnoui
pic picbase picxml mem24 mem24base mem24xml
- devicebase ${KDE_LIBS} common)
+ devicebase ${KDE_LIBS} common
+ ${GUI_LIBS}
+ ${CURSES_LIBRARIES}
+ ${LIBREADLINE_LIBRARIES} ${LIBHISTORY_LIBRARIES}
+)
install(TARGETS piklab-hex DESTINATION bin)
diff -ru piklab-0.15.8/src/piklab-prog/CMakeLists.txt piklab-0.15.9/src/piklab-prog/CMakeLists.txt
--- piklab-0.15.8/src/piklab-prog/CMakeLists.txt 2010-05-01 13:21:04.000000000 +0200
+++ piklab-0.15.9/src/piklab-prog/CMakeLists.txt 2010-05-03 00:03:50.000000000 +0200
@@ -5,17 +5,25 @@
cli_prog_manager.cpp
cli_debug_manager.cpp
)
+
+
automoc(${piklab-prog_SRCS})
+
add_executable(piklab-prog ${piklab-prog_SRCS})
-target_link_libraries(piklab-prog ${GUI_LIBS} ${LIBUSB_LIBRARIES} ${CURSES_LIBRARIES}
- ${LIBREADLINE_LIBRARIES} ${LIBHISTORY_LIBRARIES}
- proglistnoui
- picdembootloader pickit2bootloader tblbootloader
- bootloader gpsim psp pickit1
- pickit2v2 pickit2 icd1 icd2 icd2data directprog
- mem24prog picprog progmanager progbase
- coff port cli global devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase ${KDE_LIBS} common)
+
+target_link_libraries(piklab-prog
+ proglistnoui
+ picdembootloader pickit2bootloader tblbootloader
+ bootloader gpsim psp pickit1
+ pickit2v2 pickit2 icd1 icd2 icd2data directprog
+ mem24prog picprog progmanager progbase
+ coff port cli global devicelistnoui
+ pic picbase picxml mem24 mem24base mem24xml
+ devicebase ${KDE_LIBS} common
+ ${LIBUSB_LIBRARIES}
+ ${GUI_LIBS}
+ ${CURSES_LIBRARIES}
+ ${LIBREADLINE_LIBRARIES} ${LIBHISTORY_LIBRARIES}
+)
install(TARGETS piklab-prog DESTINATION bin)
diff -ru piklab-0.15.8/src/progs/direct/base/CMakeLists.txt piklab-0.15.9/src/progs/direct/base/CMakeLists.txt
--- piklab-0.15.8/src/progs/direct/base/CMakeLists.txt 2010-05-01 13:21:13.000000000 +0200
+++ piklab-0.15.9/src/progs/direct/base/CMakeLists.txt 2010-05-02 16:56:17.000000000 +0200
@@ -2,7 +2,7 @@
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/direct_data.cpp
- COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_direct_parser
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_direct_parser ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_direct_parser direct.xml
)
diff -ru piklab-0.15.8/src/progs/direct/xml/CMakeLists.txt piklab-0.15.9/src/progs/direct/xml/CMakeLists.txt
--- piklab-0.15.8/src/progs/direct/xml/CMakeLists.txt 2010-05-01 13:21:13.000000000 +0200
+++ piklab-0.15.9/src/progs/direct/xml/CMakeLists.txt 2010-05-02 18:32:53.000000000 +0200
@@ -3,6 +3,11 @@
SET(xml_direct_parser_SRCS
xml_direct_parser.cpp
)
+
add_executable(xml_direct_parser ${xml_direct_parser_SRCS})
-target_link_libraries(xml_direct_parser ${GUI_LIBS} devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common)
+
+target_link_libraries(xml_direct_parser
+ devicelistnoui pic picbase picxml
+ mem24 mem24base mem24xml xmltodata devicebase common
+ ${GUI_LIBS}
+)
diff -ru piklab-0.15.8/src/progs/gpsim/base/gpsim.cpp piklab-0.15.9/src/progs/gpsim/base/gpsim.cpp
--- piklab-0.15.8/src/progs/gpsim/base/gpsim.cpp 2010-05-01 13:21:07.000000000 +0200
+++ piklab-0.15.9/src/progs/gpsim/base/gpsim.cpp 2010-05-03 00:03:50.000000000 +0200
@@ -20,8 +20,8 @@
//-----------------------------------------------------------------------------
namespace GPSim
{
- const char* const PROMPT = "**gpsim>";
-const char* const ERROR = "***ERROR:";
+ const char* const GP_PROMPT = "**gpsim>";
+ const char* const GP_ERROR = "***ERROR:";
} // namespace
GPSim::Process::Process(Log::Base *base)
@@ -57,7 +57,7 @@
void GPSim::Process::dataReceivedSlot(::Process::OutputType type)
{
if ( type==::Process::OutputType::Stdout) {
- if (_outputs[type].stripWhiteSpace().startsWith(PROMPT)
+ if (_outputs[type].stripWhiteSpace().startsWith(GP_PROMPT)
|| _ready) {
log(Log::DebugLevel::Extra, "received console prompt", Log::Delayed);
_ready = true;
@@ -71,13 +71,13 @@
if ( type==::Process::OutputType::Stdout) {
log(Log::DebugLevel::Extra, " " + line, Log::Delayed);
QString s = line.stripWhiteSpace();
- if (s.startsWith(ERROR)) {
+ if (s.startsWith(GP_ERROR)) {
log(Log::LineType::Error, line);
return;
}
- while (s.startsWith(PROMPT)) {
+ while (s.startsWith(GP_PROMPT)) {
_ready = true;
- s = s.mid(strlen(PROMPT)).stripWhiteSpace();
+ s = s.mid(strlen(GP_PROMPT)).stripWhiteSpace();
}
_lines[type] += s;
}
diff -ru piklab-0.15.8/src/progs/icd1/base/CMakeLists.txt piklab-0.15.9/src/progs/icd1/base/CMakeLists.txt
--- piklab-0.15.8/src/progs/icd1/base/CMakeLists.txt 2010-05-01 13:21:07.000000000 +0200
+++ piklab-0.15.9/src/progs/icd1/base/CMakeLists.txt 2010-05-02 16:56:17.000000000 +0200
@@ -2,7 +2,7 @@
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icd1_data.cpp
- COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_icd1_parser
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_icd1_parser ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_icd1_parser icd1.xml
)
diff -ru piklab-0.15.8/src/progs/icd1/xml/CMakeLists.txt piklab-0.15.9/src/progs/icd1/xml/CMakeLists.txt
--- piklab-0.15.8/src/progs/icd1/xml/CMakeLists.txt 2010-05-01 13:21:07.000000000 +0200
+++ piklab-0.15.9/src/progs/icd1/xml/CMakeLists.txt 2010-05-02 18:32:53.000000000 +0200
@@ -3,7 +3,11 @@
SET(xml_icd1_parser_SRCS
xml_icd1_parser.cpp
)
-automoc(${xml_icd1_parser_SRCS})
+
add_executable(xml_icd1_parser ${xml_icd1_parser_SRCS})
-target_link_libraries(xml_icd1_parser ${GUI_LIBS} devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common)
+
+target_link_libraries(xml_icd1_parser
+ devicelistnoui pic picbase picxml
+ mem24 mem24base mem24xml xmltodata devicebase common
+ ${GUI_LIBS}
+)
diff -ru piklab-0.15.8/src/progs/icd2/base/CMakeLists.txt piklab-0.15.9/src/progs/icd2/base/CMakeLists.txt
--- piklab-0.15.8/src/progs/icd2/base/CMakeLists.txt 2010-05-01 13:21:08.000000000 +0200
+++ piklab-0.15.9/src/progs/icd2/base/CMakeLists.txt 2010-05-02 16:56:17.000000000 +0200
@@ -2,7 +2,7 @@
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icd2_data.cpp
- COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_icd2_parser
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_icd2_parser ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_icd2_parser icd2.xml
)
diff -ru piklab-0.15.8/src/progs/icd2/base/icd2.xml piklab-0.15.9/src/progs/icd2/base/icd2.xml
--- piklab-0.15.8/src/progs/icd2/base/icd2.xml 2010-05-01 13:21:08.000000000 +0200
+++ piklab-0.15.9/src/progs/icd2/base/icd2.xml 2010-05-02 18:41:21.000000000 +0200
@@ -19,6 +19,8 @@
<device name="12F508" famid="0x11" family="16F5X" support_type="tested" />
<device name="12F509" famid="0x11" family="16F5X" support_type="tested" />
<device name="12F510" famid="0x11" family="16F5X" support_type="tested" />
+ <device name="12F609" famid="0x1B" family="16F61X" />
+ <device name="12F615" famid="0x1B" family="16F61X" />
<device name="12F629" famid="0x05" family="12F629" support_type="tested" />
<device name="12F635" famid="0x0C" family="12F635" support_type="tested" />
<device name="12F675" famid="0x05" family="12F629" support_type="tested" />
@@ -29,6 +31,7 @@
<device name="16F54" famid="0x0E" family="16F5X" support_type="tested" />
<device name="16F57" famid="0x0F" family="16F5X" support_type="tested" />
<device name="16F59" famid="0x0F" family="16F5X" support_type="tested" />
+ <device name="16F610" famid="0x1B" family="16F61X" />
<device name="16F616" famid="0x1B" family="16F61X" />
<device name="16F627" famid="0x19" family="16F72" />
<device name="16F628" famid="0x19" family="16F72" />
@@ -74,6 +77,11 @@
<device name="16F877" famid="0x03" family="16F877" support_type="tested" debug_support_type="tested" />
<device name="16F877A" famid="0x04" family="16F877" />
<device name="16F88" famid="0x08" family="16F88" support_type="tested" />
+ <device name="16F882" famid="0x1B" family="16F88X" />
+ <device name="16F883" famid="0x1B" family="16F88X" />
+ <device name="16F884" famid="0x1B" family="16F88X" />
+ <device name="16F886" famid="0x1B" family="16F88X" />
+ <device name="16F887" famid="0x1B" family="16F88X" />
<device name="16F913" famid="0x14" family="16F916" />
<device name="16F914" famid="0x14" family="16F916" />
<device name="16F916" famid="0x14" family="16F916" />
diff -ru piklab-0.15.8/src/progs/icd2/icd2_data/icd2_data.cpp piklab-0.15.9/src/progs/icd2/icd2_data/icd2_data.cpp
--- piklab-0.15.8/src/progs/icd2/icd2_data/icd2_data.cpp 2010-05-01 13:21:08.000000000 +0200
+++ piklab-0.15.9/src/progs/icd2/icd2_data/icd2_data.cpp 2010-05-02 18:41:21.000000000 +0200
@@ -21,28 +21,35 @@
{ "16F874", 1, "16F874", 0x0F00, 0x1FF, 0x1FE, 0x17F/*?*/ }, // 16F873/873A/874/874A
{ "16F877", 1, "16F877", 0x1F00, 0x1EF, 0x1EE, 0x1F0/*?*/ }, // 16F876/876A/877/877A
{ "16F7X", 1, 0, 0, 0, 0, 0 }, // 16F73
+
{ 0, 2, 0, 0, 0, 0, 0 }, // 30F for revision A2 (legacy: not in MPLAB 7)
{ 0, 3, "30F", 0, 0, 0, 0 }, // 30F for revision A3/B0 (legacy: not in MPLAB 7)
+
{ "18F_4", 4, "", 0, 0, 0, 0 }, // debug executive filename is computed at runtime
{ "18F_5", 5, "", 0, 0, 0, 0 }, // debug executive filename is computed at runtime
{ "18CX01", 6, 0,/*"18CX01"*/0, 0, 0, 0 }, // 16C601/801
+
{ "10F2XX", 7, 0, 0, 0, 0, 0 }, // 10F
- { "16F5X", 7, 0, 0, 0, 0, 0 }, // 16F505/506
+ { "16F5X", 7, 0, 0, 0, 0, 0 }, // 12F508 16F505/506
+
{ "12F635", 8, "12F635", 0x0700, 0x06F, 0x06E, 0x0F0/*?*/ }, // 12F635/683 16F631/636/639
- { "16F785", 8, "16F916", 0x0700, 0x06F, 0x06E, 0x1F0/*?*/ }, // 16F785
- { "16F916", 8, "16F916", 0x1F00, 0x16F, 0x16E, 0x1F0/*?*/ }, // 16F913/914/916/917/946
+ { "16F677", 8, 0, 0, 0, 0, 0 }, // 16F677
{ "16F684", 8, "16F684", 0x0700, 0x16F, 0x16E, 0x1F0/*?*/ }, // 16F684
{ "16F688", 8, "16F688", 0x0F00, 0x16F, 0x16E, 0x1F0/*?*/ }, // 16F685/687/688/689/690
- { "16F677", 8, 0, 0, 0, 0, 0 }, // 16F677
+ { "16F785", 8, "16F916", 0x0700, 0x06F, 0x06E, 0x1F0/*?*/ }, // 16F785
+ { "16F88X", 8, 0, 0, 0, 0, 0 }, // 16F88X
+ { "16F916", 8, "16F916", 0x1F00, 0x16F, 0x16E, 0x1F0/*?*/ }, // 16F913/914/916/917/946
+
{ "12F629", 9, "12F629", 0x0300, 0x0DF, 0x0DE, 0x0D4/*?*/ }, // 12F629/675
{ "16F629", 9, 0, 0, 0, 0, 0 }, // 16F629
{ "16F676", 9, "16F676", 0x0300, 0x0DF, 0x0DE, 0x0D4/*?*/ }, // 16F630/676
+
{ "30F", 10, "30f_REVB",0, 0, 0, 0 }, // 30F revision B1 and above
{ "18F_J", 11, 0, 0, 0, 0, 0 }, // 18FXXJXX (?)
{ "16F72", 12, 0, 0, 0, 0, 0 }, // 16F72/8X/627/628/84A
{ "24F", 14, "24F", 0, 0, 0, 0 }, // from MPLAB 7.3
{ "33F", 14, "33f", 0, 0, 0, 0 }, // from MPLAB 7.3
- { "16F61X", 15, 0, 0, 0, 0, 0 }, // 12F61X/16F61X
+ { "16F61X", 15, 0, 0, 0, 0, 0 }, // 12F609/61X 16F61X
{ 0, 0, 0, 0, 0, 0, 0 }
};
diff -ru piklab-0.15.8/src/progs/icd2/xml/CMakeLists.txt piklab-0.15.9/src/progs/icd2/xml/CMakeLists.txt
--- piklab-0.15.8/src/progs/icd2/xml/CMakeLists.txt 2010-05-01 13:21:08.000000000 +0200
+++ piklab-0.15.9/src/progs/icd2/xml/CMakeLists.txt 2010-05-02 18:32:53.000000000 +0200
@@ -3,6 +3,11 @@
SET(xml_icd2_parser_SRCS
xml_icd2_parser.cpp
)
+
add_executable(xml_icd2_parser ${xml_icd2_parser_SRCS})
-target_link_libraries(xml_icd2_parser ${GUI_LIBS} icd2data devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common)
+
+target_link_libraries(xml_icd2_parser
+ icd2data devicelistnoui pic picbase picxml
+ mem24 mem24base mem24xml xmltodata devicebase common
+ ${GUI_LIBS}
+)
diff -ru piklab-0.15.8/src/progs/picdem_bootloader/base/CMakeLists.txt piklab-0.15.9/src/progs/picdem_bootloader/base/CMakeLists.txt
--- piklab-0.15.8/src/progs/picdem_bootloader/base/CMakeLists.txt 2010-05-01 13:21:13.000000000 +0200
+++ piklab-0.15.9/src/progs/picdem_bootloader/base/CMakeLists.txt 2010-05-02 16:56:17.000000000 +0200
@@ -2,7 +2,7 @@
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/picdem_bootloader_data.cpp
- COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_picdem_bootloader_parser
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_picdem_bootloader_parser ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_picdem_bootloader_parser picdem_bootloader.xml
)
diff -ru piklab-0.15.8/src/progs/picdem_bootloader/xml/CMakeLists.txt piklab-0.15.9/src/progs/picdem_bootloader/xml/CMakeLists.txt
--- piklab-0.15.8/src/progs/picdem_bootloader/xml/CMakeLists.txt 2010-05-01 13:21:13.000000000 +0200
+++ piklab-0.15.9/src/progs/picdem_bootloader/xml/CMakeLists.txt 2010-05-02 18:32:53.000000000 +0200
@@ -3,7 +3,11 @@
SET(xml_picdem_bootloader_parser_SRCS
xml_picdem_bootloader_parser.cpp
)
+
add_executable(xml_picdem_bootloader_parser ${xml_picdem_bootloader_parser_SRCS})
-target_link_libraries(xml_picdem_bootloader_parser ${GUI_LIBS}
+
+target_link_libraries(xml_picdem_bootloader_parser
devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common)
+ mem24 mem24base mem24xml xmltodata devicebase common
+ ${GUI_LIBS}
+)
diff -ru piklab-0.15.8/src/progs/pickit1/base/CMakeLists.txt piklab-0.15.9/src/progs/pickit1/base/CMakeLists.txt
--- piklab-0.15.8/src/progs/pickit1/base/CMakeLists.txt 2010-05-01 13:21:12.000000000 +0200
+++ piklab-0.15.9/src/progs/pickit1/base/CMakeLists.txt 2010-05-02 16:56:17.000000000 +0200
@@ -2,7 +2,7 @@
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/pickit1_data.cpp
- COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_pickit1_parser
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_pickit1_parser ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_pickit1_parser pickit1.xml
)
diff -ru piklab-0.15.8/src/progs/pickit1/xml/CMakeLists.txt piklab-0.15.9/src/progs/pickit1/xml/CMakeLists.txt
--- piklab-0.15.8/src/progs/pickit1/xml/CMakeLists.txt 2010-05-01 13:21:12.000000000 +0200
+++ piklab-0.15.9/src/progs/pickit1/xml/CMakeLists.txt 2010-05-02 18:32:53.000000000 +0200
@@ -3,6 +3,11 @@
SET(xml_pickit1_parser_SRCS
xml_pickit1_parser.cpp
)
+
add_executable(xml_pickit1_parser ${xml_pickit1_parser_SRCS})
-target_link_libraries(xml_pickit1_parser ${GUI_LIBS} devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common)
+
+target_link_libraries(xml_pickit1_parser
+ devicelistnoui pic picbase picxml
+ mem24 mem24base mem24xml xmltodata devicebase common
+ ${GUI_LIBS}
+)
diff -ru piklab-0.15.8/src/progs/pickit2/base/CMakeLists.txt piklab-0.15.9/src/progs/pickit2/base/CMakeLists.txt
--- piklab-0.15.8/src/progs/pickit2/base/CMakeLists.txt 2010-05-01 13:21:13.000000000 +0200
+++ piklab-0.15.9/src/progs/pickit2/base/CMakeLists.txt 2010-05-02 16:56:17.000000000 +0200
@@ -2,7 +2,7 @@
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/pickit2_data.cpp
- COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_pickit2_parser
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_pickit2_parser ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_pickit2_parser pickit2.xml
)
diff -ru piklab-0.15.8/src/progs/pickit2/xml/CMakeLists.txt piklab-0.15.9/src/progs/pickit2/xml/CMakeLists.txt
--- piklab-0.15.8/src/progs/pickit2/xml/CMakeLists.txt 2010-05-01 13:21:12.000000000 +0200
+++ piklab-0.15.9/src/progs/pickit2/xml/CMakeLists.txt 2010-05-02 18:32:53.000000000 +0200
@@ -3,6 +3,11 @@
SET(xml_pickit2_parser_SRCS
xml_pickit2_parser.cpp
)
+
add_executable(xml_pickit2_parser ${xml_pickit2_parser_SRCS})
-target_link_libraries(xml_pickit2_parser ${GUI_LIBS} devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common)
+
+target_link_libraries(xml_pickit2_parser
+ devicelistnoui pic picbase picxml
+ mem24 mem24base mem24xml xmltodata devicebase common
+ ${GUI_LIBS}
+)
diff -ru piklab-0.15.8/src/progs/pickit2_bootloader/base/CMakeLists.txt piklab-0.15.9/src/progs/pickit2_bootloader/base/CMakeLists.txt
--- piklab-0.15.8/src/progs/pickit2_bootloader/base/CMakeLists.txt 2010-05-01 13:21:07.000000000 +0200
+++ piklab-0.15.9/src/progs/pickit2_bootloader/base/CMakeLists.txt 2010-05-02 16:56:17.000000000 +0200
@@ -2,7 +2,7 @@
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/pickit2_bootloader_data.cpp
- COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_pickit2_bootloader_parser
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_pickit2_bootloader_parser ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_pickit2_bootloader_parser pickit2_bootloader.xml
)
diff -ru piklab-0.15.8/src/progs/pickit2_bootloader/xml/CMakeLists.txt piklab-0.15.9/src/progs/pickit2_bootloader/xml/CMakeLists.txt
--- piklab-0.15.8/src/progs/pickit2_bootloader/xml/CMakeLists.txt 2010-05-01 13:21:07.000000000 +0200
+++ piklab-0.15.9/src/progs/pickit2_bootloader/xml/CMakeLists.txt 2010-05-02 18:32:53.000000000 +0200
@@ -3,7 +3,11 @@
SET(xml_pickit2_bootloader_parser_SRCS
xml_pickit2_bootloader_parser.cpp
)
-automoc(${xml_pickit2_bootloader_parser_SRCS})
+
add_executable(xml_pickit2_bootloader_parser ${xml_pickit2_bootloader_parser_SRCS})
-target_link_libraries(xml_pickit2_bootloader_parser ${GUI_LIBS} devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common)
+
+target_link_libraries(xml_pickit2_bootloader_parser
+ devicelistnoui pic picbase picxml
+ mem24 mem24base mem24xml xmltodata devicebase common
+ ${GUI_LIBS}
+)
diff -ru piklab-0.15.8/src/progs/psp/base/CMakeLists.txt piklab-0.15.9/src/progs/psp/base/CMakeLists.txt
--- piklab-0.15.8/src/progs/psp/base/CMakeLists.txt 2010-05-01 13:21:11.000000000 +0200
+++ piklab-0.15.9/src/progs/psp/base/CMakeLists.txt 2010-05-02 16:56:17.000000000 +0200
@@ -2,7 +2,7 @@
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/psp_data.cpp
- COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_psp_parser
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_psp_parser ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_psp_parser psp.xml
)
diff -ru piklab-0.15.8/src/progs/psp/xml/CMakeLists.txt piklab-0.15.9/src/progs/psp/xml/CMakeLists.txt
--- piklab-0.15.8/src/progs/psp/xml/CMakeLists.txt 2010-05-01 13:21:10.000000000 +0200
+++ piklab-0.15.9/src/progs/psp/xml/CMakeLists.txt 2010-05-02 18:32:53.000000000 +0200
@@ -3,7 +3,11 @@
SET(xml_psp_parser_SRCS
xml_psp_parser.cpp
)
-automoc(${xml_psp_parser_SRCS})
+
add_executable(xml_psp_parser ${xml_psp_parser_SRCS})
-target_link_libraries(xml_psp_parser ${GUI_LIBS} devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common)
+
+target_link_libraries(xml_psp_parser
+ devicelistnoui pic picbase picxml
+ mem24 mem24base mem24xml xmltodata devicebase common
+ ${GUI_LIBS}
+)
diff -ru piklab-0.15.8/src/progs/tbl_bootloader/base/CMakeLists.txt piklab-0.15.9/src/progs/tbl_bootloader/base/CMakeLists.txt
--- piklab-0.15.8/src/progs/tbl_bootloader/base/CMakeLists.txt 2010-05-01 13:21:10.000000000 +0200
+++ piklab-0.15.9/src/progs/tbl_bootloader/base/CMakeLists.txt 2010-05-02 16:56:17.000000000 +0200
@@ -2,7 +2,7 @@
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tbl_bootloader_data.cpp
- COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_tbl_bootloader_parser
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_tbl_bootloader_parser ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../xml/xml_tbl_bootloader_parser tbl_bootloader.xml
)
diff -ru piklab-0.15.8/src/progs/tbl_bootloader/xml/CMakeLists.txt piklab-0.15.9/src/progs/tbl_bootloader/xml/CMakeLists.txt
--- piklab-0.15.8/src/progs/tbl_bootloader/xml/CMakeLists.txt 2010-05-01 13:21:10.000000000 +0200
+++ piklab-0.15.9/src/progs/tbl_bootloader/xml/CMakeLists.txt 2010-05-02 18:32:53.000000000 +0200
@@ -3,7 +3,11 @@
SET(xml_tbl_bootloader_parser_SRCS
xml_tbl_bootloader_parser.cpp
)
-automoc(${xml_tbl_bootloader_parser_SRCS})
+
add_executable(xml_tbl_bootloader_parser ${xml_tbl_bootloader_parser_SRCS})
-target_link_libraries(xml_tbl_bootloader_parser ${GUI_LIBS} devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common)
+
+target_link_libraries(xml_tbl_bootloader_parser
+ devicelistnoui pic picbase picxml
+ mem24 mem24base mem24xml xmltodata devicebase common
+ ${GUI_LIBS}
+)
diff -ru piklab-0.15.8/src/xml_to_data/xml_to_data.cpp piklab-0.15.9/src/xml_to_data/xml_to_data.cpp
--- piklab-0.15.8/src/xml_to_data/xml_to_data.cpp 2010-05-01 13:21:14.000000000 +0200
+++ piklab-0.15.9/src/xml_to_data/xml_to_data.cpp 2010-05-02 16:56:17.000000000 +0200
@@ -10,6 +10,7 @@
#include <qfile.h>
#include <qtextstream.h>
+#include <qdir.h>
QDomElement XmlToData::findUniqueElement(QDomElement parent, const QString &tag,
const QString &attribute, const QString &value) const
@@ -63,8 +64,16 @@
else ::qFatal("Fatal [%s]: %s", currentDevice().latin1(), message.latin1());
}
-void XmlToData::process()
+void XmlToData::process(int argc, char** argv)
{
+ if (argc != 2) {
+ qFatal("Need one argument");
+ }
+ QString path = argv[1];
+ if (!QDir::setCurrent(path)) {
+ qFatal("Need path as argument");
+ }
+
parse();
qDebug("Parsing XML successful.");
output();
diff -ru piklab-0.15.8/src/xml_to_data/xml_to_data.h piklab-0.15.9/src/xml_to_data/xml_to_data.h
--- piklab-0.15.8/src/xml_to_data/xml_to_data.h 2010-05-01 13:21:14.000000000 +0200
+++ piklab-0.15.9/src/xml_to_data/xml_to_data.h 2010-05-02 16:56:17.000000000 +0200
@@ -22,7 +22,7 @@
public:
XmlToData() {}
virtual ~XmlToData() {}
- void process();
+ void process(int argc, char** argv);
protected:
virtual void parse() = 0;
@@ -37,10 +37,10 @@
};
#define XML_MAIN(_type) \
- int main(int, char **) \
+ int main(int argc, char** argv) \
{ \
_type dx; \
- dx.process(); \
+ dx.process(argc, argv); \
return 0; \
}
distrib
>
Fedora
>
14
>
x86_64
>
media
>
os-src
>
by-pkgid
>
4f4591cc04f6fc87545ff6779d488043
>
files
>
4
