|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:27
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22512/build/bakefiles Modified Files: Tag: modularisation wxDevCenter.bkl wxDevCenter-unix.bkl install.bkl Removed Files: Tag: modularisation wxdc-plugins.bkl wxdc-modules.bkl Log Message: Change module to plugin. Index: wxDevCenter-unix.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles/Attic/wxDevCenter-unix.bkl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** wxDevCenter-unix.bkl 21 Sep 2005 15:00:38 -0000 1.1.2.1 --- wxDevCenter-unix.bkl 29 Sep 2005 17:05:00 -0000 1.1.2.2 *************** *** 2,19 **** <makefile> ! <!-- wxDockIt. --> ! <include file="wxDockIt.bkl" /> ! <!-- wxdc-modules.bkl. --> ! <include file="wxdc-modules.bkl" /> ! <module id="wxdc-unix" template="wxdc-module" cond="PLATFORM_UNIX=='1'"> ! <dllname>wxdc-unix</dllname> <include>include</include> - <dirname>./modules</dirname> - <sources> - src/unix/FileSystemStandard.cpp src/MainFrame.cpp src/MDIFrame.cpp --- 2,37 ---- <makefile> ! <using module="datafiles" /> ! <dll id="wxdc.fs.unix" template="wxDLL" cond="PLATFORM_UNIX=='1'"> ! <dllname>wxdc_fs_unix-$(WXDEVCENTER-VERSION)</dllname> ! <libname>wxdc_fs_unix-$(WXDEVCENTER-VERSION)</libname> ! <depends>wxDevCenterLib</depends> ! ! <include>include</include> ! <sources> ! src/unix/FileSystemStandard-unix.cpp ! </sources> ! ! <wxlib /> ! <wxlib-base>xml</wxlib-base> ! <wxlib-gui>adv</wxlib-gui> ! <sys-lib>wxDevCenterLib</sys-lib> ! <lib-path>./lib</lib-path> ! ! <dirname>./plugins/wxdc.fs.unix</dirname> ! <install-to>$(LIBDIR)/wxDevCenter/plugins/wxdc.fs.unix</install-to> ! </dll> ! ! ! <dll id="wxdc.ui.frames" template="wxDLL" cond="PLATFORM_UNIX=='1'"> ! <dllname>wxdc_ui_frames-$(WXDEVCENTER-VERSION)</dllname> ! <libname>wxdc_ui_frames-$(WXDEVCENTER-VERSION)</libname> ! <depends>wxDevCenterLib</depends> ! <include>include</include> <sources> src/MainFrame.cpp src/MDIFrame.cpp *************** *** 24,29 **** <wxlib-gui>adv</wxlib-gui> <wxDockItLib /> - </module> - </makefile> --- 42,64 ---- <wxlib-gui>adv</wxlib-gui> <wxDockItLib /> + <sys-lib>wxDevCenterLib</sys-lib> + <lib-path>./lib</lib-path> + + <dirname>./plugins/wxdc.ui.frames</dirname> + <install-to>$(LIBDIR)/wxDevCenter/plugins/wxdc.ui.frames</install-to> + </dll> + + + <!-- Install plugin descriptors. --> + <data-files-tree > + <srcdir>plugins</srcdir> + <install-to>$(DATADIR)/wxDevCenter/plugins</install-to> + <files> + wxdc.fs.msw/plugin.xml + wxdc.fs.unix/plugin.xml + wxdc.ui.frames/plugin.xml + </files> + </data-files-tree> + </makefile> Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles/Attic/install.bkl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** install.bkl 21 Sep 2005 15:00:38 -0000 1.1.2.1 --- install.bkl 29 Sep 2005 17:05:00 -0000 1.1.2.2 *************** *** 27,31 **** wxDevCenter/Layout.h wxDevCenter/Manager.h - wxDevCenter/Module.h wxDevCenter/Plugin.h wxDevCenter/Project.h --- 27,30 ---- *************** *** 66,78 **** </data-files-tree> ! <!-- Install freedesktop menu info. --> ! <set var="FREEDESKTOP_MENU_FILE"> ! <if cond="BUILD=='release'">wxdevcenter.desktop</if> ! <if cond="BUILD=='debug'">wxdevcenterd.desktop</if> ! </set> ! <data-files id="freedesktop_menu_test"> <srcdir>data</srcdir> <install-to>$(DATADIR)/applications</install-to> ! <files>$(FREEDESKTOP_MENU_FILE)</files> </data-files> --- 65,81 ---- </data-files-tree> ! <!-- Install feature descriptor. --> ! <data-files-tree > ! <srcdir>features</srcdir> ! <install-to>$(DATADIR)/wxDevCenter/features</install-to> ! <files> ! wxdc/feature.xml ! </files> ! </data-files-tree> ! ! <data-files id="freedesktop_menu"> <srcdir>data</srcdir> <install-to>$(DATADIR)/applications</install-to> ! <files>$wxdevcenter.desktop</files> </data-files> --- wxdc-modules.bkl DELETED --- --- wxdc-plugins.bkl DELETED --- Index: wxDevCenter.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles/Attic/wxDevCenter.bkl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** wxDevCenter.bkl 24 Sep 2005 12:45:44 -0000 1.1.2.2 --- wxDevCenter.bkl 29 Sep 2005 17:05:00 -0000 1.1.2.3 *************** *** 2,5 **** --- 2,7 ---- <makefile> + <set var="WXDEVCENTER-VERSION">0.3.0</set> + <!-- Determine what plateform is used. --> <set var="DIRSPEC"> *************** *** 9,13 **** <!-- wxDockIt. --> ! <include file="wxDockIt.bkl" /> <!-- Set the build directory. --> --- 11,15 ---- <!-- wxDockIt. --> ! <include file="wxDockIt.bkl" /> <!-- Set the build directory. --> *************** *** 17,21 **** <dllname>wxDevCenterLib</dllname> <libname>wxDevCenterLib</libname> ! <version>0.3.0</version> <dirname>lib</dirname> --- 19,23 ---- <dllname>wxDevCenterLib</dllname> <libname>wxDevCenterLib</libname> ! <version>$(WXDEVCENTER-VERSION)</version> <dirname>lib</dirname> *************** *** 41,53 **** src/FileSystemTreeCtrl.cpp src/FileSystemStandard.cpp - src/$(DIRSPEC)/FileSystemStandard-$(DIRSPEC).cpp src/FileTools.cpp src/Frame.cpp src/Layout.cpp - src/MainFrame.cpp src/Manager.cpp - src/MDIFrame.cpp src/MiniView.cpp - src/Module.cpp src/Plugin.cpp src/Project.cpp --- 43,51 ---- *************** *** 71,75 **** <exe id="wxDevCenter" template="wxEXE"> <app-type>gui</app-type> ! <exename>wxDevCenter$(SUFFIX)</exename> <dirname>./bin</dirname> --- 69,73 ---- <exe id="wxDevCenter" template="wxEXE"> <app-type>gui</app-type> ! <exename>wxDevCenter</exename> <dirname>./bin</dirname> |