[wxdevcenter-commits] SF.net SVN: wxdevcenter:[71] trunk/wxdevcenter

[<cur...@us...>]

Revision: 71
          http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=71&view=rev
Author:   cursorstar
Date:     2011-01-04 19:00:00 +0000 (Tue, 04 Jan 2011)

Log Message:
-----------
Big big commit with :
  - better bakefilization
  - add execute plugin

Modified Paths:
--------------
    trunk/wxdevcenter/Makefile.in
    trunk/wxdevcenter/autogen.sh
    trunk/wxdevcenter/build/bakefiles/Bakefiles.bkgen
    trunk/wxdevcenter/build/bakefiles/plugins.bkl
    trunk/wxdevcenter/build/bakefiles/wxdevcenter.bkl
    trunk/wxdevcenter/configure.ac
    trunk/wxdevcenter/po/Makefile.in.in
    trunk/wxdevcenter/src/sys/config.cpp
    trunk/wxdevcenter/src/sys/plugin.cpp
    trunk/wxdevcenter/src/sys/plugin.hpp
    trunk/wxdevcenter/src/sys/search.hpp
    trunk/wxdevcenter/src/ui/art.cpp

Added Paths:
-----------
    trunk/wxdevcenter/build/m4/autoconf_inc.m4
    trunk/wxdevcenter/plugins/execute/
    trunk/wxdevcenter/plugins/execute/execprocess.cpp
    trunk/wxdevcenter/plugins/execute/execprocess.hpp
    trunk/wxdevcenter/plugins/execute/execute.cpp
    trunk/wxdevcenter/plugins/execute/execute.hpp
    trunk/wxdevcenter/share/xrc/TextPlugin.xrc
    trunk/wxdevcenter/src/config.h.in
    trunk/wxdevcenter/src/sys/log.cpp
    trunk/wxdevcenter/src/sys/log.hpp
    trunk/wxdevcenter/src/sys/process.cpp
    trunk/wxdevcenter/src/sys/process.hpp

Removed Paths:
-------------
    trunk/wxdevcenter/build/bakefiles/.bakefile_gen.state
    trunk/wxdevcenter/configure

Modified: trunk/wxdevcenter/Makefile.in
===================================================================
--- trunk/wxdevcenter/Makefile.in	2010-05-13 20:00:42 UTC (rev 70)
+++ trunk/wxdevcenter/Makefile.in	2011-01-04 19:00:00 UTC (rev 71)
@@ -49,6 +49,8 @@
 	libwxdevcenter_task.o \
 	libwxdevcenter_bookmark.o \
 	libwxdevcenter_search.o \
+	libwxdevcenter_process.o \
+	libwxdevcenter_log.o \
 	libwxdevcenter_bitvector.o \
 	libwxdevcenter_document.o \
 	libwxdevcenter_view.o \
@@ -76,6 +78,10 @@
 	dctext_bookmark.o \
 	dctext_markbar.o \
 	dctext_text_search.o
+DCEXECUTE_CXXFLAGS = -Isrc $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+DCEXECUTE_OBJECTS =  \
+	dcexecute_execute.o \
+	dcexecute_execprocess.o
 DCBITMAP_CXXFLAGS = -Isrc $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 DCBITMAP_OBJECTS =  \
 	dcbitmap_bitmap.o
@@ -99,7 +105,7 @@
 
 ### Targets: ###
 
-all: $(DLLPREFIX)libwxdevcenter.$(SO_SUFFIX) wxdevcenter$(EXEEXT) plugins/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE) plugins/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE)
+all: $(DLLPREFIX)libwxdevcenter.$(SO_SUFFIX) wxdevcenter$(EXEEXT) plugins/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE) plugins/$(DLLPREFIX_MODULE)dcexecute.$(SO_SUFFIX_MODULE) plugins/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE)
 
 install: 
 
@@ -114,6 +120,7 @@
 	rm -f $(LIBPREFIX)libwxdevcenter.$(DLLIMP_SUFFIX)
 	rm -f wxdevcenter$(EXEEXT)
 	rm -f plugins/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE)
+	rm -f plugins/$(DLLPREFIX_MODULE)dcexecute.$(SO_SUFFIX_MODULE)
 	rm -f plugins/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE)
 
 distclean: clean
@@ -131,6 +138,9 @@
 plugins/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE): $(DCTEXT_OBJECTS)
 	$(SHARED_LD_MODULE_CXX) $@ $(DCTEXT_OBJECTS)  $(LDFLAGS)  $(LIBS)
 
+plugins/$(DLLPREFIX_MODULE)dcexecute.$(SO_SUFFIX_MODULE): $(DCEXECUTE_OBJECTS)
+	$(SHARED_LD_MODULE_CXX) $@ $(DCEXECUTE_OBJECTS)  $(LDFLAGS)  $(LIBS)
+
 plugins/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE): $(DCBITMAP_OBJECTS)
 	$(SHARED_LD_MODULE_CXX) $@ $(DCBITMAP_OBJECTS)  $(LDFLAGS)  $(LIBS)
 
@@ -155,6 +165,12 @@
 libwxdevcenter_search.o: $(srcdir)/src/sys/search.cpp
 	$(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/sys/search.cpp
 
+libwxdevcenter_process.o: $(srcdir)/src/sys/process.cpp
+	$(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/sys/process.cpp
+
+libwxdevcenter_log.o: $(srcdir)/src/sys/log.cpp
+	$(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/sys/log.cpp
+
 libwxdevcenter_bitvector.o: $(srcdir)/src/tools/bitvector.cpp
 	$(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/tools/bitvector.cpp
 
@@ -224,6 +240,12 @@
 dctext_text_search.o: $(srcdir)/plugins/text/text-search.cpp
 	$(CXXC) -c -o $@ $(DCTEXT_CXXFLAGS) $(srcdir)/plugins/text/text-search.cpp
 
+dcexecute_execute.o: $(srcdir)/plugins/execute/execute.cpp
+	$(CXXC) -c -o $@ $(DCEXECUTE_CXXFLAGS) $(srcdir)/plugins/execute/execute.cpp
+
+dcexecute_execprocess.o: $(srcdir)/plugins/execute/execprocess.cpp
+	$(CXXC) -c -o $@ $(DCEXECUTE_CXXFLAGS) $(srcdir)/plugins/execute/execprocess.cpp
+
 dcbitmap_bitmap.o: $(srcdir)/plugins/bitmap/bitmap.cpp
 	$(CXXC) -c -o $@ $(DCBITMAP_CXXFLAGS) $(srcdir)/plugins/bitmap/bitmap.cpp
 

Modified: trunk/wxdevcenter/autogen.sh
===================================================================
--- trunk/wxdevcenter/autogen.sh	2010-05-13 20:00:42 UTC (rev 70)
+++ trunk/wxdevcenter/autogen.sh	2011-01-04 19:00:00 UTC (rev 71)
@@ -6,14 +6,6 @@
 
 DIE=0
 
-if [ -n "$GNOME2_DIR" ]; then
-	ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
-	LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"
-	PATH="$GNOME2_DIR/bin:$PATH"
-	export PATH
-	export LD_LIBRARY_PATH
-fi
-
 (test -f $srcdir/configure.ac) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level package directory"
@@ -28,63 +20,6 @@
   DIE=1
 }
 
-(grep "^IT_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo 
-    echo "**Error**: You must have \`intltool' installed."
-    echo "You can get it from:"
-    echo "  ftp://ftp.gnome.org/pub/GNOME/"
-    DIE=1
-  }
-}
-
-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.ac >/dev/null) && {
-  (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`xml-i18n-toolize' installed."
-    echo "You can get it from:"
-    echo "  ftp://ftp.gnome.org/pub/GNOME/"
-    DIE=1
-  }
-}
-
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`libtool' installed."
-    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-  }
-}
-
-(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.ac >/dev/null) && {
-  (grep "sed.*POTFILES" $srcdir/configure.ac) > /dev/null || \
-  (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`glib' installed."
-    echo "You can get it from: ftp://ftp.gtk.org/pub/gtk"
-    DIE=1
-  }
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`automake' installed."
-  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
-  echo "installed doesn't appear recent enough."
-  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
 if test "$DIE" -eq 1; then
   exit 1
 fi
@@ -112,43 +47,33 @@
 
       aclocalinclude="$ACLOCAL_FLAGS"
 
-      if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
-	echo "Creating $dr/aclocal.m4 ..."
-	test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	echo "Running glib-gettextize...  Ignore non-fatal messages."
-	echo "no" | glib-gettextize --force --copy
-	echo "Making $dr/aclocal.m4 writable ..."
-	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-      fi
-      if grep "^IT_PROG_INTLTOOL" configure.ac >/dev/null; then
-        echo "Running intltoolize..."
-	intltoolize --copy --force --automake
-      fi
-      if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then
-        echo "Running xml-i18n-toolize..."
-	xml-i18n-toolize --copy --force --automake
-      fi
       if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize..."
-	  libtoolize --force --copy
-	fi
+	    if test -z "$NO_LIBTOOLIZE" ; then 
+	      echo "Running libtoolize..."
+	      libtoolize --force
+	    fi
       fi
+      
       echo "Running aclocal $aclocalinclude ..."
       aclocal $aclocalinclude
+      
       if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
+	    echo "Running autoheader..."
+	    autoheader
       fi
-      echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
+      
+      if grep "^AC_BAKEFILE" configure.ac >/dev/null; then
+        echo "Running bakefilize ..."
+        bakefilize --force
+      fi
+      
       echo "Running autoconf ..."
       autoconf
     )
   fi
 done
 
-conf_flags="--enable-maintainer-mode"
+conf_flags=""
 
 if test x$NOCONFIGURE = x; then
   echo Running $srcdir/configure $conf_flags "$@" ...

Deleted: trunk/wxdevcenter/build/bakefiles/.bakefile_gen.state
===================================================================
--- trunk/wxdevcenter/build/bakefiles/.bakefile_gen.state	2010-05-13 20:00:42 UTC (rev 70)
+++ trunk/wxdevcenter/build/bakefiles/.bakefile_gen.state	2011-01-04 19:00:00 UTC (rev 71)
@@ -1,13 +0,0 @@
-K.}q
((UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklUmsvs2003prjtq(cdependencies
-DepsRecord
-qoq}q(Uoutputsq]q((UE/home/mimile/Projects/wxdevcenter/build/msw/wx_vc7_wxdevcenter.vcprojUreplaceqtq	(U6/home/mimile/Projects/wxdevcenter/build/msw/wx_vc7.slnhtq
-(UH/home/mimile/Projects/wxdevcenter/build/msw/wx_vc7_libwxdevcenter.vcprojhtqeUdepsq]q
-((cdependencies
-FileDep
-qoq}qUfilenameqU$/usr/share/bakefile/rules/common.bklqsb(hoq}qhU%/usr/share/bakefile/rules/version.bklqsb(hoq}qhU"/usr/share/bakefile/rules/dirs.bklqsb(hoq}qhU-/usr/share/bakefile/rules/format_features.bklqsb(hoq}qhU)/usr/share/bakefile/rules/msvs2003prj.bklqsb(hoq}q hU)/usr/share/bakefile/rules/msvs200xprj.bklq!sb(hoq"}q#hU4/usr/share/bakefile/rules/msvc_prj_vcproj_common.bklq$sb(hoq%}q&hU-/usr/share/bakefile/rules/msvc_prj_common.bklq'sb(hoq(}q)hU#/usr/share/bakefile/rules/win32.bklq*sb(hoq+}q,hU@/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx.bklq-sb(hoq.}q/hUG/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_presets.pyq0sb(hoq1}q2hUF/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_win32.bklq3sb(hoq4}q5hUD/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_xrc.bklq6sb(hoq7}q8hU</home/mimile/Projects/wxdevcenter/build/bakefiles/config.bklq9sb(hoq:}q;hU)/usr/share/bakefile/output/msvs200xprj.pyq<sbeub(UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklUmsvs2005prjtq=(hoq>}q?(Uoutputsq@]qA((U6/home/mimile/Projects/wxdevcenter/build/msw/wx_vc8.slnUreplaceqBtqC(UH/home/mimile/Projects/wxdevcenter/build/msw/wx_vc8_libwxdevcenter.vcprojhBtqD(UE/home/mimile/Projects/wxdevcenter/build/msw/wx_vc8_wxdevcenter.vcprojhBtqEeUdepsqF]qG((hoqH}qIUfilenameqJU$/usr/share/bakefile/rules/common.bklqKsb(hoqL}qMhJU%/usr/share/bakefile/rules/version.bklqNsb(hoqO}qPhJU"/usr/share/bakefile/rules/dirs.bklqQsb(hoqR}qShJU-/usr/share/bakefile/rules/format_features.bklqTsb(hoqU}qVhJU)/usr/share/bakefile/rules/msvs2005prj.bklqWsb(hoqX}qYhJU)/usr/share/bakefile/rules/msvs200xprj.bklqZsb(hoq[}q\hJU4/usr/share/bakefile/rules/msvc_prj_vcproj_common.bklq]sb(hoq^}q_hJU-/usr/share/bakefile/rules/msvc_prj_common.bklq`sb(hoqa}qbhJU#/usr/share/bakefile/rules/win32.bklqcsb(hoqd}qehJU@/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx.bklqfsb(hoqg}qhhJUG/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_presets.pyqisb(hoqj}qkhJUF/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_win32.bklqlsb(hoqm}qnhJUD/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_xrc.bklqosb(hoqp}qqhJU</home/mimile/Projects/wxdevcenter/build/bakefiles/config.bklqrsb(hoqs}qthJU)/usr/share/bakefile/output/msvs200xprj.pyqusbeub(UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklUmingwtqv(hoqw}qx(Uoutputsqy]qz(U8/home/mimile/Projects/wxdevcenter/build/msw/makefile.gccUreplacetq{aUdepsq|]q}((hoq~}qUfilenameq\x80U$/usr/share/bakefile/rules/common.bklq\x81sb(hoq\x82}q\x83h\x80U%/usr/share/bakefile/rules/version.bklq\x84sb(hoq\x85}q\x86h\x80U"/usr/share/bakefile/rules/dirs.bklq\x87sb(hoq\x88}q\x89h\x80U-/usr/share/bakefile/rules/format_features.bklq\x8Asb(hoq\x8B}q\x8Ch\x80U#/usr/share/bakefile/rules/mingw.bklq\x8Dsb(hoq\x8E}q\x8Fh\x80U&/usr/share/bakefile/rules/makefile.bklq\x90sb(hoq\x91}q\x92h\x80U1/usr/share/bakefile/rules/makefile_defs_mingw.bklq\x93sb(hoq\x94}q\x95h\x80U#/usr/share/bakefile/rules/win32.bklq\x96sb(hoq\x97}q\x98h\x80U//usr/share/bakefile/rules/makefile_defs_gnu.bklq\x99sb(hoq\x9A}q\x9Bh\x80U,/usr/share/bakefile/rules/makefile_mingw.bklq\x9Csb(hoq\x9D}q\x9Eh\x80U@/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx.bklq\x9Fsb(hoq\xA0}q\xA1h\x80UG/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_presets.pyq\xA2sb(hoq\xA3}q\xA4h\x80UF/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_win32.bklq\xA5sb(hoq\xA6}q\xA7h\x80UD/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_xrc.bklq\xA8sb(hoq\xA9}q\xAAh\x80U</home/mimile/Projects/wxdevcenter/build/bakefiles/config.bklq\xABsb(hoq\xAC}q\xADh\x80U'/usr/share/bakefile/output/gnumake.empyq\xAEsbeub(UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklUmsvctq\xAF(hoq\xB0}q\xB1(Uoutputsq\xB2]q\xB3(U7/home/mimile/Projects/wxdevcenter/build/msw/makefile.vcUreplacetq\xB4aUdepsq\xB5]q\xB6((hoq\xB7}q\xB8Ufilenameq\xB9U$/usr/share/bakefile/rules/common.bklq\xBAsb(hoq\xBB}q\xBCh\xB9U%/usr/share/bakefile/rules/version.bklq\xBDsb(hoq\xBE}q\xBFh\xB9U"/usr/share/bakefile/rules/dirs.bklq\xC0sb(hoq\xC1}q\xC2h\xB9U-/usr/share/bakefile/rules/format_features.bklq\xC3sb(hoq\xC4}q\xC5h\xB9U"/usr/share/bakefile/rules/msvc.bklq\xC6sb(hoq\xC7}q\xC8h\xB9U&/usr/share/bakefile/rules/makefile.bklq\xC9sb(hoq\xCA}q\xCBh\xB9U0/usr/share/bakefile/rules/makefile_defs_msvc.bklq\xCCsb(hoq\xCD}q\xCEh\xB9U#/usr/share/bakefile/rules/win32.bklq\xCFsb(hoq\xD0}q\xD1h\xB9U)/usr/share/bakefile/rules/msvc_common.bklq\xD2sb(hoq\xD3}q\xD4h\xB9U@/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx.bklq\xD5sb(hoq\xD6}q\xD7h\xB9UG/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_presets.pyq\xD8sb(hoq\xD9}q\xDAh\xB9UF/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_win32.bklq\xDBsb(hoq\xDC}q\xDDh\xB9UD/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_xrc.bklq\xDEsb(hoq\xDF}q\xE0h\xB9U</home/mimile/Projects/wxdevcenter/build/bakefiles/config.bklq\xE1sb(hoq\xE2}q\xE3h\xB9U$/usr/share/bakefile/output/msvc.empyq\xE4sbeub(UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklUautoconftq\xE5(hoq\xE6}q\xE7(Uoutputsq\xE8]q\xE9((U1/home/mimile/Projects/wxdevcenter/autoconf_inc.m4UmergeBlocksWithFilelisttq\xEA(U-/home/mimile/Projects/wxdevcenter/Makefile.inUreplacetq\xEBeUdepsq\xEC]q\xED((hoq\xEE}q\xEFUfilenameq\xF0U$/usr/share/bakefile/rules/common.bklq\xF1sb(hoq\xF2}q\xF3h\xF0U%/usr/share/bakefile/rules/version.bklq\xF4sb(hoq\xF5}q\xF6h\xF0U"/usr/share/bakefile/rules/dirs.bklq\xF7sb(hoq\xF8}q\xF9h\xF0U-/usr/share/bakefile/rules/format_features.bklq\xFAsb(hoq\xFB}q\xFCh\xF0U&/usr/share/bakefile/rules/autoconf.bklq\xFDsb(hoq\xFE}q\xFFh\xF0U-/usr/share/bakefile/rules/makefile_macres.bklr