diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile index a573ba665fe5..c3c928a0e348 100644 --- a/editors/codelite/Makefile +++ b/editors/codelite/Makefile @@ -1,12 +1,8 @@ -# New ports collection Makefile for: codelite -# Date created: 7 May 2008 -# Whom: gahr -# +# Created by: gahr # $FreeBSD$ -# PORTNAME= codelite -DISTVERSION= 4.1.${SVN_REVISION} +DISTVERSION= 5.0.${SVN_REVISION} CATEGORIES= editors devel MASTER_SITES= SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION:R}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-gtk.src @@ -24,15 +20,19 @@ OPTIONS_DEFINE= CSCOPE CLANG MYSQL PGSQL CSCOPE_DESC= CScope integration CLANG_DESC= Clang code-completion -USE_WX= 2.8 +USE_WX= 2.9 WX_UNICODE= yes +USE_DOS2UNIX= *.cpp USE_GMAKE= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS+=--enable-debug +CPPFLAGS+= -g -O0 +CONFIGURE_ARGS+=--enable-debug \ + --prefix=${PREFIX} +CONFIGURE_ENV+= WXCONFIG=${WX_CONFIG} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -SVN_REVISION= 5770 +SVN_REVISION= 6213 .include @@ -41,10 +41,13 @@ RUN_DEPENDS+= cscope:${PORTSDIR}/devel/cscope .endif .if ${PORT_OPTIONS:MCLANG} +.if ${OSVERSION} < 1000026 BUILD_DEPENDS+= ${LOCALBASE}/lib/libclang.so:${PORTSDIR}/lang/clang RUN_DEPENDS+= ${LOCALBASE}/lib/libclang.so:${PORTSDIR}/lang/clang +.endif PLIST_SUB+= CLANG="" .else +CONFIGURE_ARGS+=--without-clang ENABLE_CLANG= \# PLIST_SUB+= CLANG="@comment " .endif @@ -66,12 +69,9 @@ PLIST_SUB+= POSTGRES="@comment " .endif post-patch: - ${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|g; s|%%ENABLE_CLANG%%|${ENABLE_CLANG}|g; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure -# Configure script does not respect --prefix - ${REINPLACE_CMD} -e '/^prefix/s|/usr|${PREFIX}|; \ - /^plugins_dir/s|/usr/lib/codelite|${DATADIR}/plugins|' \ - ${WRKSRC}/configure +# Use the correct wx-config + ${REINPLACE_CMD} -e 's|%%ENABLE_CLANG%%|${ENABLE_CLANG}|g; \ + s|%%LOCALBASE%%|${LOCALBASE}|g; s|666|644|' ${WRKSRC}/configure ${REINPLACE_CMD} -e 's|$${cur_rev}|${SVN_REVISION}|' \ ${WRKSRC}/le_makerevision.sh # CTags already installed diff --git a/editors/codelite/distinfo b/editors/codelite/distinfo index 7ea2e7c56c6b..5f6e88263336 100644 --- a/editors/codelite/distinfo +++ b/editors/codelite/distinfo @@ -1,2 +1,2 @@ -SHA256 (codelite-4.1.5770-gtk.src.tar.gz) = 35f7ca260441977cfbf63d89ce4e2ef59a5a30fa35e08fb17f468ea2158fdf92 -SIZE (codelite-4.1.5770-gtk.src.tar.gz) = 21608418 +SHA256 (codelite-5.0.6213-gtk.src.tar.gz) = 022f66bc9ea2d56c66592e26a0f3c003a36f0188c352c391c6450e02f14bcc34 +SIZE (codelite-5.0.6213-gtk.src.tar.gz) = 21883718 diff --git a/editors/codelite/files/patch-Plugin_wxterminal.cpp b/editors/codelite/files/patch-Plugin_wxterminal.cpp index 281ddc0e2a33..1625370b0de2 100644 --- a/editors/codelite/files/patch-Plugin_wxterminal.cpp +++ b/editors/codelite/files/patch-Plugin_wxterminal.cpp @@ -1,16 +1,16 @@ ---- Plugin/wxterminal.cpp.orig 2011-06-09 22:23:36.000000000 +0200 -+++ Plugin/wxterminal.cpp 2012-02-17 17:15:06.000000000 +0100 -@@ -22,7 +22,13 @@ - #endif - - #if defined(__WXGTK__) -+#ifdef __FreeBSD__ -+# include -+# include -+# include -+#else - # include -+#endif - # include "unixprocess_impl.h" - #elif defined(__WXMAC__) - # include +--- Plugin/wxterminal.cpp.orig 2013-01-12 18:39:52.000000000 +0100 ++++ Plugin/wxterminal.cpp 2013-02-01 14:55:54.000000000 +0100 +@@ -23,7 +23,13 @@ + #endif + + #if defined(__WXGTK__) ++#ifdef __FreeBSD__ ++# include ++# include ++# include ++#else + # include ++#endif + # include "unixprocess_impl.h" + #elif defined(__WXMAC__) + # include diff --git a/editors/codelite/files/patch-Runtime_codelite_kill_children b/editors/codelite/files/patch-Runtime_codelite_kill_children index 377ac1368f33..721c4f787daa 100644 --- a/editors/codelite/files/patch-Runtime_codelite_kill_children +++ b/editors/codelite/files/patch-Runtime_codelite_kill_children @@ -1,10 +1,17 @@ ---- Runtime/codelite_kill_children.orig 2009-05-23 13:23:08.000000000 +0200 -+++ Runtime/codelite_kill_children 2009-05-23 13:41:35.000000000 +0200 -@@ -1,6 +1,6 @@ - #!/bin/sh +--- Runtime/codelite_kill_children.orig 2013-02-01 14:56:41.000000000 +0100 ++++ Runtime/codelite_kill_children 2013-02-01 15:04:59.000000000 +0100 +@@ -4,8 +4,13 @@ + ## for "hard kills" + + sig_options=$2 ++osname=$(uname -o) -procs=`ps --ppid $1 | grep -v PID | awk '{print $1;}'` -+procs=`ps -A -o ppid,pid | grep -v PPID | awk '{print $1" "$2}' | grep "^$1 " | awk '{print $2}' | xargs` ++if [ "$osname" = "FreeBSD" ]; then ++ procs=`ps -A -o ppid,pid | sed -e '1d' | awk '{print $1" "$2}' | grep "^$1 " | awk '{print $2}' | xargs` ++else ++ procs=`ps --ppid $1 | grep -v PID | awk '{print $1;}'` ++fi for p in $procs do - kill -9 $p + kill $sig_options $p 2> /dev/null diff --git a/editors/codelite/files/patch-clang b/editors/codelite/files/patch-clang new file mode 100644 index 000000000000..3126e9a1a3ae --- /dev/null +++ b/editors/codelite/files/patch-clang @@ -0,0 +1,33 @@ +--- LiteEditor/clang_driver.cpp.orig 2013-02-01 17:27:10.000000000 +0100 ++++ LiteEditor/clang_driver.cpp 2013-02-01 17:28:50.000000000 +0100 +@@ -533,6 +533,7 @@ + tag->SetSignature (entrySignature); + + // Add support for clang comment parsing ++#ifndef __FreeBSD__ + CXString BriefComment = clang_getCompletionBriefComment(str); + const char* comment = clang_getCString(BriefComment); + if( comment && comment[0] != '\0' ) { +@@ -540,6 +541,7 @@ + } + + clang_disposeString(BriefComment); ++#endif + + switch(kind) { + case CXCursor_EnumConstantDecl: +--- LiteEditor/clang_pch_maker_thread.cpp.orig 2013-02-01 17:29:21.000000000 +0100 ++++ LiteEditor/clang_pch_maker_thread.cpp 2013-02-01 17:32:18.000000000 +0100 +@@ -130,7 +130,11 @@ + task->GetColumn(), + usf.GetUnsavedFiles(), + usf.GetCount(), +- clang_defaultCodeCompleteOptions() | CXCodeComplete_IncludeBriefComments); ++ clang_defaultCodeCompleteOptions() ++#ifndef __FreeBSD__ ++ | CXCodeComplete_IncludeBriefComments ++#endif ++ ); + + cacheEntry.lastReparse = time(NULL); + diff --git a/editors/codelite/files/patch-clang31 b/editors/codelite/files/patch-clang31 deleted file mode 100644 index 9693d496a558..000000000000 --- a/editors/codelite/files/patch-clang31 +++ /dev/null @@ -1,29 +0,0 @@ ---- LiteEditor/clang_driver.cpp.orig 2012-08-30 10:23:36.000000000 +0200 -+++ LiteEditor/clang_driver.cpp 2012-08-30 10:24:08.000000000 +0200 -@@ -670,6 +670,7 @@ - tag->SetSignature (entrySignature); - - // Add support for clang comment parsing -+ /* - CXString BriefComment = clang_getCompletionBriefComment(str); - const char* comment = clang_getCString(BriefComment); - if( comment && comment[0] != '\0' ) { -@@ -677,6 +678,7 @@ - } - - clang_disposeString(BriefComment); -+ */ - - switch(kind) { - case CXCursor_EnumConstantDecl: ---- LiteEditor/clang_pch_maker_thread.cpp.orig 2012-08-30 10:24:32.000000000 +0200 -+++ LiteEditor/clang_pch_maker_thread.cpp 2012-08-30 10:24:51.000000000 +0200 -@@ -130,7 +130,7 @@ - task->GetColumn(), - usf.GetUnsavedFiles(), - usf.GetCount(), -- clang_defaultCodeCompleteOptions() | CXCodeComplete_IncludeBriefComments); -+ clang_defaultCodeCompleteOptions() /*| CXCodeComplete_IncludeBriefComments*/); - - cacheEntry.lastReparse = time(NULL); - diff --git a/editors/codelite/files/patch-configure b/editors/codelite/files/patch-configure index 38e0ffe4b21c..15d929eccd43 100644 --- a/editors/codelite/files/patch-configure +++ b/editors/codelite/files/patch-configure @@ -1,44 +1,27 @@ ---- configure.orig 2011-11-30 10:40:33.000000000 +0100 -+++ configure 2012-02-29 16:28:53.000000000 +0100 -@@ -50,6 +50,20 @@ +--- configure.orig 2013-01-23 17:10:11.000000000 +0100 ++++ configure 2013-02-01 15:11:13.000000000 +0100 +@@ -84,6 +84,20 @@ with_clang="yes" fi -+ elif [ "$os_name" = "FreeBSD" ]; then -+ arch=$(uname -m) -+ if [ $arch = "amd64" -o $arch = "sparc64" ]; then ++ elif [ "$os_name" = "FreeBSD" ]; then ++ arch=$(uname -m) ++ if [ $arch = "amd64" -o $arch = "sparc64" ]; then + compiler_extras="-m64 -DON_64_BIT " + c_compiler_extras="-m64 -DON_64_BIT " -+ else ++ else + compiler_extras="-m32 " + c_compiler_extras="-m32 " -+ fi -+ ## clang -+%%ENABLE_CLANG%% with_clang="yes" -+%%ENABLE_CLANG%% lib_clang_cmp_flags=" -DHAS_LIBCLANG -I%%LOCALBASE%%/include " -+%%ENABLE_CLANG%% lib_clang_link_flags=" -L%%LOCALBASE%%/lib -lclang " -+%%ENABLE_CLANG%% lib_clang="%%LOCALBASE%%/lib/libclang.so" ++ fi ++ ## clang ++ %%ENABLE_CLANG%% with_clang="yes" ++ %%ENABLE_CLANG%% lib_clang_cmp_flags=" -DHAS_LIBCLANG -I%%LOCALBASE%%/include " ++ %%ENABLE_CLANG%% lib_clang_link_flags=" -L%%LOCALBASE%%/lib -lclang " ++ %%ENABLE_CLANG%% lib_clang="%%LOCALBASE%%/lib/libclang.so" else # Not darwin if [ "$is_64bit" = "yes" ]; then -@@ -96,14 +110,14 @@ - debug_flag=" -g " - ext=ud - optimization=" -DREGEXP_UNICODE " -- wxcfg="--unicode=yes --debug=yes" -+ wxcfg="--unicode=yes " - else - objects_dir="Release_gcc_unicode" - configuration="Release_gcc_unicode" - ext=u - debug_flag="" - optimization=" -O3 -DREGEXP_UNICODE " -- wxcfg="--unicode=yes --debug=no" -+ wxcfg="--unicode=yes " - fi - - echo "OPT=${optimization}" >> Makefile -@@ -465,9 +479,9 @@ +@@ -785,9 +799,9 @@ elif [ "$rule_name" = "DatabaseLayerSQLite" ] ; then createVariables "yes" "-I${base_dir}/sdk/databaselayer/src/sqlite3" elif [ "$rule_name" = "DatabaseLayerMySQL" ] ; then diff --git a/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp b/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp index 815e206b4b45..e7b574829d17 100644 --- a/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp +++ b/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp @@ -1,18 +1,18 @@ --- sdk/codelite_indexer/utils.cpp.orig 2010-08-02 08:43:19.000000000 +0200 +++ sdk/codelite_indexer/utils.cpp 2012-02-17 17:18:13.000000000 +0100 @@ -17,6 +17,15 @@ - # include - #endif - -+#ifdef __FreeBSD__ -+#include -+#include -+#include -+#include -+#include -+#include -+#endif -+ - /** - * helper string methods - */ + # include + #endif + ++#ifdef __FreeBSD__ ++#include ++#include ++#include ++#include ++#include ++#include ++#endif ++ + /** + * helper string methods + */ diff --git a/editors/codelite/pkg-plist b/editors/codelite/pkg-plist index c46bc114329a..043e07b3d3dd 100644 --- a/editors/codelite/pkg-plist +++ b/editors/codelite/pkg-plist @@ -7,10 +7,99 @@ bin/codelite_fix_files bin/codelite_indexer bin/codelite_kill_children bin/codelite_xterm +lib/codelite/CallGraph.so +lib/codelite/CodeFormatter.so +lib/codelite/ContinuousBuild.so +lib/codelite/Copyright.so +lib/codelite/CppCheck.so +lib/codelite/DatabaseExplorer.so +lib/codelite/ExternalTools.so +lib/codelite/Gizmos.so +lib/codelite/Outline.so +lib/codelite/QmakePlugin.so +lib/codelite/SnipWiz.so +lib/codelite/Subversion2.so +lib/codelite/UnitTestCPP.so +lib/codelite/ZoomNavigator.so +lib/codelite/abbreviation.so +lib/codelite/cscope.so +lib/codelite/debuggers/Debugger.so +lib/codelite/git.so +lib/codelite/libcodeliteud.so +lib/codelite/libdblayersqliteud.so +lib/codelite/libpluginud.so +lib/codelite/libwx_baseu-2.9.so +lib/codelite/libwx_baseu-2.9.so.4 +lib/codelite/libwx_baseu-2.9.so.4.0.0 +lib/codelite/libwx_baseu_net-2.9.so +lib/codelite/libwx_baseu_net-2.9.so.4 +lib/codelite/libwx_baseu_net-2.9.so.4.0.0 +lib/codelite/libwx_baseu_xml-2.9.so +lib/codelite/libwx_baseu_xml-2.9.so.4 +lib/codelite/libwx_baseu_xml-2.9.so.4.0.0 +lib/codelite/libwx_gtk2u_adv-2.9.so +lib/codelite/libwx_gtk2u_adv-2.9.so.4 +lib/codelite/libwx_gtk2u_adv-2.9.so.4.0.0 +lib/codelite/libwx_gtk2u_aui-2.9.so +lib/codelite/libwx_gtk2u_aui-2.9.so.4 +lib/codelite/libwx_gtk2u_aui-2.9.so.4.0.0 +lib/codelite/libwx_gtk2u_core-2.9.so +lib/codelite/libwx_gtk2u_core-2.9.so.4 +lib/codelite/libwx_gtk2u_core-2.9.so.4.0.0 +lib/codelite/libwx_gtk2u_gl-2.9.so +lib/codelite/libwx_gtk2u_gl-2.9.so.4 +lib/codelite/libwx_gtk2u_gl-2.9.so.4.0.0 +lib/codelite/libwx_gtk2u_html-2.9.so +lib/codelite/libwx_gtk2u_html-2.9.so.4 +lib/codelite/libwx_gtk2u_html-2.9.so.4.0.0 +lib/codelite/libwx_gtk2u_media-2.9.so +lib/codelite/libwx_gtk2u_media-2.9.so.4 +lib/codelite/libwx_gtk2u_media-2.9.so.4.0.0 +lib/codelite/libwx_gtk2u_propgrid-2.9.so +lib/codelite/libwx_gtk2u_propgrid-2.9.so.4 +lib/codelite/libwx_gtk2u_propgrid-2.9.so.4.0.0 +lib/codelite/libwx_gtk2u_qa-2.9.so +lib/codelite/libwx_gtk2u_qa-2.9.so.4 +lib/codelite/libwx_gtk2u_qa-2.9.so.4.0.0 +lib/codelite/libwx_gtk2u_ribbon-2.9.so +lib/codelite/libwx_gtk2u_ribbon-2.9.so.4 +lib/codelite/libwx_gtk2u_ribbon-2.9.so.4.0.0 +lib/codelite/libwx_gtk2u_richtext-2.9.so +lib/codelite/libwx_gtk2u_richtext-2.9.so.4 +lib/codelite/libwx_gtk2u_richtext-2.9.so.4.0.0 +lib/codelite/libwx_gtk2u_stc-2.9.so +lib/codelite/libwx_gtk2u_stc-2.9.so.4 +lib/codelite/libwx_gtk2u_stc-2.9.so.4.0.0 +lib/codelite/libwx_gtk2u_webview-2.9.so +lib/codelite/libwx_gtk2u_webview-2.9.so.4 +lib/codelite/libwx_gtk2u_webview-2.9.so.4.0.0 +lib/codelite/libwx_gtk2u_xrc-2.9.so +lib/codelite/libwx_gtk2u_xrc-2.9.so.4 +lib/codelite/libwx_gtk2u_xrc-2.9.so.4.0.0 +lib/codelite/libwxshapeframeworkud.so +lib/codelite/libwxsqlite3ud.so +lib/codelite/resources/abbrev.png +lib/codelite/resources/abbreviation.accelerators +lib/codelite/resources/compfile.png +lib/codelite/resources/connect_no.png +lib/codelite/resources/cppcheck.png +lib/codelite/resources/cscope.accelerators +lib/codelite/resources/external_tools.accelerators +lib/codelite/resources/qt16_new.png +lib/codelite/resources/qt16_preferences.png +lib/codelite/resources/qt24_new.png +lib/codelite/resources/qt24_preferences.png +lib/codelite/resources/svn_diff.png +lib/codelite/resources/svn_settings.png +lib/codelite/resources/svn_ssh.png +lib/codelite/resources/wxfb_conflict.png +lib/codelite/resources/wxfb_modified.png +lib/codelite/resources/wxfb_ok.png +lib/codelite/wxformbuilder.so %%DATADIR%%/LICENSE %%DATADIR%%/astyle.sample -%%DATADIR%%/codelite-icons.zip %%DATADIR%%/codelite-icons-fresh-farm.zip +%%DATADIR%%/codelite-icons.zip %%DATADIR%%/config/accelerators.conf.default %%DATADIR%%/config/build_settings.xml.default %%DATADIR%%/config/codelite.xml.default @@ -27,47 +116,6 @@ bin/codelite_xterm %%DATADIR%%/index.html %%DATADIR%%/lexers/lexers_black.xml %%DATADIR%%/lexers/lexers_default.xml -%%DATADIR%%/plugins/CallGraph.so -%%DATADIR%%/plugins/CodeFormatter.so -%%DATADIR%%/plugins/ContinuousBuild.so -%%DATADIR%%/plugins/Copyright.so -%%DATADIR%%/plugins/CppCheck.so -%%DATADIR%%/plugins/DatabaseExplorer.so -%%DATADIR%%/plugins/ExternalTools.so -%%DATADIR%%/plugins/Gizmos.so -%%DATADIR%%/plugins/Outline.so -%%DATADIR%%/plugins/QmakePlugin.so -%%DATADIR%%/plugins/SnipWiz.so -%%DATADIR%%/plugins/Subversion2.so -%%DATADIR%%/plugins/UnitTestCPP.so -%%DATADIR%%/plugins/abbreviation.so -%%DATADIR%%/plugins/cscope.so -%%DATADIR%%/plugins/debuggers/Debugger.so -%%DATADIR%%/plugins/git.so -%%DATADIR%%/plugins/libcodeliteud.so -%%DATADIR%%/plugins/libdblayersqliteud.so -%%DATADIR%%/plugins/libpluginud.so -%%DATADIR%%/plugins/libwxscintillaud.so -%%DATADIR%%/plugins/libwxshapeframeworkud.so -%%DATADIR%%/plugins/libwxsqlite3ud.so -%%DATADIR%%/plugins/resources/abbrev.png -%%DATADIR%%/plugins/resources/abbreviation.accelerators -%%DATADIR%%/plugins/resources/compfile.png -%%DATADIR%%/plugins/resources/connect_no.png -%%DATADIR%%/plugins/resources/cppcheck.png -%%DATADIR%%/plugins/resources/cscope.accelerators -%%DATADIR%%/plugins/resources/external_tools.accelerators -%%DATADIR%%/plugins/resources/qt16_new.png -%%DATADIR%%/plugins/resources/qt16_preferences.png -%%DATADIR%%/plugins/resources/qt24_new.png -%%DATADIR%%/plugins/resources/qt24_preferences.png -%%DATADIR%%/plugins/resources/svn_diff.png -%%DATADIR%%/plugins/resources/svn_settings.png -%%DATADIR%%/plugins/resources/svn_ssh.png -%%DATADIR%%/plugins/resources/wxfb_conflict.png -%%DATADIR%%/plugins/resources/wxfb_modified.png -%%DATADIR%%/plugins/resources/wxfb_ok.png -%%DATADIR%%/plugins/wxformbuilder.so %%DATADIR%%/rc/menu.xrc %%DATADIR%%/src/unittest++1.3.tar.gz %%DATADIR%%/svnreport.html @@ -78,8 +126,20 @@ bin/codelite_xterm %%DATADIR%%/templates/codedesigner/SCHTemplateWithMain.cdp %%DATADIR%%/templates/databaselayer/dataClass.ctmp %%DATADIR%%/templates/databaselayer/dataClass.htmp +%%DATADIR%%/templates/databaselayer/dataClass_dba.ctmp +%%DATADIR%%/templates/databaselayer/dataClass_dba.htmp +%%DATADIR%%/templates/databaselayer/dataClass_dbl.ctmp +%%DATADIR%%/templates/databaselayer/dataClass_dbl.htmp +%%DATADIR%%/templates/databaselayer/dataClass_wxdba.ctmp +%%DATADIR%%/templates/databaselayer/dataClass_wxdba.htmp %%DATADIR%%/templates/databaselayer/viewClass.ctmp %%DATADIR%%/templates/databaselayer/viewClass.htmp +%%DATADIR%%/templates/databaselayer/viewClass_dba.ctmp +%%DATADIR%%/templates/databaselayer/viewClass_dba.htmp +%%DATADIR%%/templates/databaselayer/viewClass_dbl.ctmp +%%DATADIR%%/templates/databaselayer/viewClass_dbl.htmp +%%DATADIR%%/templates/databaselayer/viewClass_wxdba.ctmp +%%DATADIR%%/templates/databaselayer/viewClass_wxdba.htmp %%DATADIR%%/templates/formbuilder/DialogTemplate.fbp %%DATADIR%%/templates/formbuilder/DialogTemplateWithButtons.fbp %%DATADIR%%/templates/formbuilder/FrameTemplate.fbp @@ -110,12 +170,28 @@ bin/codelite_xterm %%DATADIR%%/templates/projects/UnitTest++/UnitTest++.project %%DATADIR%%/templates/projects/UnitTest++/icon.png %%DATADIR%%/templates/projects/UnitTest++/main.cpp +%%DATADIR%%/templates/projects/c_gtk24_template/c_gtk24_template.project +%%DATADIR%%/templates/projects/c_gtk24_template/icon.png +%%DATADIR%%/templates/projects/c_gtk24_template/main.c +%%DATADIR%%/templates/projects/c_gtk3_template/c_gtk3_template.project +%%DATADIR%%/templates/projects/c_gtk3_template/icon.png +%%DATADIR%%/templates/projects/c_gtk3_template/main.c %%DATADIR%%/templates/projects/cobra-executableU/build-file %%DATADIR%%/templates/projects/cobra-executableU/cobra-executableU.project %%DATADIR%%/templates/projects/cobra-libraryU/cobra-library.project %%DATADIR%%/templates/projects/cobra-libraryU/lib-build-files %%DATADIR%%/templates/projects/cobra-staticU/build-file %%DATADIR%%/templates/projects/cobra-staticU/cobra-staticU.project +%%DATADIR%%/templates/projects/cpp_gtkmm24_template/cpp_gtkmm24_template.project +%%DATADIR%%/templates/projects/cpp_gtkmm24_template/icon.png +%%DATADIR%%/templates/projects/cpp_gtkmm24_template/main.cpp +%%DATADIR%%/templates/projects/cpp_gtkmm24_template/mainwindow.cpp +%%DATADIR%%/templates/projects/cpp_gtkmm24_template/mainwindow.h +%%DATADIR%%/templates/projects/cpp_gtkmm3_template/cpp_gtkmm3_template.project +%%DATADIR%%/templates/projects/cpp_gtkmm3_template/icon.png +%%DATADIR%%/templates/projects/cpp_gtkmm3_template/main.cpp +%%DATADIR%%/templates/projects/cpp_gtkmm3_template/mainwindow.cpp +%%DATADIR%%/templates/projects/cpp_gtkmm3_template/mainwindow.h %%DATADIR%%/templates/projects/custom-makefile/custom-makefile.project %%DATADIR%%/templates/projects/custom-makefile/icon.png %%DATADIR%%/templates/projects/dynamic-library-wx-enabled/dynamic-library-wx-enabled.project @@ -190,12 +266,16 @@ bin/codelite_xterm %%DATADIR%%/templates/projects/vc-static-lib/icon.png %%DATADIR%%/templates/projects/vc-static-lib/vc-static-lib.project %%DATADIR%%/templates/qmake/qmake.project -%%CLANG%%%%DATADIR%%/plugins/libclang.so -%%MYSQL%%%%DATADIR%%/plugins/libdblayermysqlud.so -%%POSTGRES%%%%DATADIR%%/plugins/libdblayerpostgresud.so +%%CLANG%%lib/codelite/libclang.so +%%MYSQL%%lib/codelite/libdblayermysqlud.so +%%POSTGRES%%lib/codelite/libdblayerpostgresud.so share/applications/codelite.desktop @dirrmtry share/applications @dirrm %%DATADIR%%/templates/qmake +@dirrm %%DATADIR%%/templates/projects/cpp_gtkmm3_template +@dirrm %%DATADIR%%/templates/projects/cpp_gtkmm24_template +@dirrm %%DATADIR%%/templates/projects/c_gtk3_template +@dirrm %%DATADIR%%/templates/projects/c_gtk24_template @dirrm %%DATADIR%%/templates/projects/vc-static-lib @dirrm %%DATADIR%%/templates/projects/vc-executable @dirrm %%DATADIR%%/templates/projects/vc-dynamic-library @@ -233,9 +313,9 @@ share/applications/codelite.desktop @dirrm %%DATADIR%%/templates @dirrm %%DATADIR%%/src @dirrm %%DATADIR%%/rc -@dirrm %%DATADIR%%/plugins/resources -@dirrm %%DATADIR%%/plugins/debuggers -@dirrm %%DATADIR%%/plugins +@dirrm lib/codelite/resources +@dirrm lib/codelite/debuggers +@dirrm lib/codelite @dirrm %%DATADIR%%/lexers @dirrm %%DATADIR%%/images @dirrm %%DATADIR%%/config