Attachment #520558 for bug #643494

Lines 537-542 Link Here

(-)old/configure.ac (+4 lines)
537	src/plugins/contrib/EditorTweaks/Makefile	537	src/plugins/contrib/EditorTweaks/Makefile
538	src/plugins/contrib/envvars/Makefile	538	src/plugins/contrib/envvars/Makefile
539	src/plugins/contrib/FileManager/Makefile	539	src/plugins/contrib/FileManager/Makefile
		540	src/plugins/contrib/FortranProject/Makefile
		541	src/plugins/contrib/FortranProject/images/Makefile
		542	src/plugins/contrib/FortranProject/images/16x16/Makefile
		543	src/plugins/contrib/FortranProject/images/fortranproject/Makefile
540	src/plugins/contrib/headerfixup/Makefile	544	src/plugins/contrib/headerfixup/Makefile
541	src/plugins/contrib/help_plugin/Makefile	545	src/plugins/contrib/help_plugin/Makefile
542	src/plugins/contrib/help_plugin/bzip2/Makefile	546	src/plugins/contrib/help_plugin/bzip2/Makefile




	AM_CONDITIONAL([BUILD_EDITORTWEAKS], [false])
	AM_CONDITIONAL([BUILD_ENVVARS], [false])
	AM_CONDITIONAL([BUILD_FILEMANAGER], [false])
	AM_CONDITIONAL([BUILD_FORTRANPROJECT], [false])
	AM_CONDITIONAL([BUILD_HEADERFIXUP], [false])
	AM_CONDITIONAL([BUILD_HELP], [false])
	AM_CONDITIONAL([BUILD_KEYBINDER], [false])

	AM_CONDITIONAL([BUILD_EDITORTWEAKS], [true])
	AM_CONDITIONAL([BUILD_ENVVARS], [true])
	AM_CONDITIONAL([BUILD_FILEMANAGER], [true])
	AM_CONDITIONAL([BUILD_FORTRANPROJECT], [true])
	AM_CONDITIONAL([BUILD_HEADERFIXUP], [true])
	AM_CONDITIONAL([BUILD_HELP], [true])
	AM_CONDITIONAL([BUILD_KEYBINDER], [true])

  [                        compiles none of the contrib-plugins ]
  [                        Plugin names are: AutoVersioning, BrowseTracker, byogames, Cccc, CppCheck, cbkoders, codesnippets, ]
  [                        		     codestat, copystrings, Cscope, DoxyBlocks, dragscroll, EditorConfig, EditorTweaks, envvars, ]
  [                        		     FileManager, FortranProject, headerfixup, help, hexeditor, incsearch, keybinder, libfinder, MouseSap, ]
  [                        		     NassiShneiderman, ProjectOptionsManipulator, profiler, regex, ReopenEditor, exporter, smartindent, spellchecker, ]
  [                        		     symtab, ThreadSearch, ToolsPlus, Valgrind, wxcontrib, wxsmith, wxsmithcontrib, wxsmithaui ],
  plugins="$withval", plugins="none")

	FileManager)
		AM_CONDITIONAL([BUILD_FILEMANAGER], [true])
		;;
	FortranProject)
		AM_CONDITIONAL([BUILD_FORTRANPROJECT], [true])
		;;
	headerfixup)
		AM_CONDITIONAL([BUILD_HEADERFIXUP], [true])
		;;

	-FileManager)
		AM_CONDITIONAL([BUILD_FILEMANAGER], [false])
		;;
	-FortranProject)
		AM_CONDITIONAL([BUILD_FORTRANPROJECT], [false])
		;;
	-headerfixup)
		AM_CONDITIONAL([BUILD_HEADERFIXUP], [false])
		;;

AC_SUBST(BUILD_EDITORTWEAKS)
AC_SUBST(BUILD_ENVVARS)
AC_SUBST(BUILD_FILEMANAGER)
AC_SUBST(BUILD_FORTRANPROJECT)
AC_SUBST(BUILD_HEADERFIXUP)
AC_SUBST(BUILD_HELP)
AC_SUBST(BUILD_HEXEDITOR)




SUBDIRS = images

AM_CPPFLAGS = $(WX_CXXFLAGS) \
		-I$(top_srcdir)/src/include \
		-I$(top_srcdir)/src/include/tinyxml \
		-I$(top_srcdir)/src/sdk/wxscintilla/include \
		-I../FortranProject

pluginlibdir = $(pkglibdir)/plugins

pluginlib_LTLIBRARIES = libFortranProject.la

libFortranProject_la_LDFLAGS = @MODULE_SHARED_LDFLAGS@ -version-info 0:1:0 -no-undefined -avoid-version

libFortranProject_la_LIBADD = ../../../sdk/libcodeblocks.la \
			$(WX_LIBS) \
			$(CB_TINYXML_LIBS)

libFortranProject_la_SOURCES = autoinsert.cpp \
					bindto.cpp \
					bindtonewtype.cpp \
					bufferparserthread.cpp \
					calledbydict.cpp \
					calltree.cpp \
					calltreeview.cpp \
					ccsmartfilter.cpp \
					changecase.cpp \
					constrhighlighter.cpp \
					docblock.cpp \
					farrays.cpp \
					fconstruct.cpp \
					finfowindow.cpp \
					formatindent.cpp \
					formatindentdlg.cpp \
					fortranfileext.cpp \
					fortranproject.cpp \
					fpimagelist.cpp \
					fpoptionsdlg.cpp \
					includedb.cpp \
					indentestimator.cpp \
					jumptracker.cpp \
					keywordsparserf.cpp \
					lineaddress.cpp \
					makefiledlg.cpp \
					makefilegen.cpp \
					moduletokenf.cpp \
					nativeparserf.cpp \
					parserf.cpp \
					parserthreadf.cpp \
					projectdependencies.cpp \
					tab2space.cpp \
					textcutter.cpp \
					tokenf.cpp \
					tokenizerf.cpp \
					usetokenf.cpp \
					workspacebrowserbuilder.cpp \
					workspacebrowserf.cpp \
					workspaceparserthread.cpp

noinst_HEADERS = autoinsert.h \
					bindto.h \
					bindtonewtype.h \
					bufferparserthread.h \
					calledbydict.h \
					calltree.h \
					calltreeview.h \
					ccsmartfilter.h \
					changecase.h \
					constrhighlighter.h \
					docblock.h \
					farrays.h \
					fconstruct.h \
					finfowindow.h \
					formatindent.h \
					formatindentdlg.h \
					fortranfileext.h \
					fortranproject.h \
					fpimagelist.h \
					fpoptionsdlg.h \
					includedb.h \
					indentestimator.h \
					jumptracker.h \
					keywordsparserf.h \
					lineaddress.h \
					makefiledlg.h \
					makefilegen.h \
					moduletokenf.h \
					nativeparserf.h \
					parserf.h \
					parserthreadf.h \
					projectdependencies.h \
					tab2space.h \
					textcutter.h \
					tokenf.h \
					tokenizerf.h \
					usetokenf.h \
					workspacebrowserbuilder.h \
					workspacebrowserf.h \
					workspaceparserthread.h

EXTRA_DIST = $(srcdir)/*.cbp \
		wxsmith/Bindto.wxs \
		wxsmith/BindNewType.wxs \
		wxsmith/FormatIndent.wxs \
		wxsmith/MakefileDlg.wxs \
		manifest.xml \
		resources/changecase.xrc \
		resources/fortranprojecttoolbar.xrc \
		resources/settings.xrc \
		resources/tab2space.xrc \
		resources/workspacebrowserf.xrc \
		update* \
		images/*.png \
		images/16x16/*.png \
		images/fortranproject/*.png \
		images/fortranproject/*.f90

pkgdata_DATA = FortranProject.zip

CLEANFILES = $(pkgdata_DATA)

FortranProject.zip: manifest.xml
	PWD=`pwd` cd $(srcdir) && zip -j9 $(PWD)/FortranProject.zip manifest.xml resources/*.xrc > /dev/null
	PWD=`pwd` cd $(srcdir) && zip -R9 $(PWD)/FortranProject.zip images/*.png images/16x16/*.png images/fortranproject/*.png images/fortranproject/*.f90 > /dev/null

Added Link Here

(-)old/src/plugins/contrib/FortranProject/images/16x16/Makefile.am (+3 lines)
1	pkgdatadir = $(datadir)/@PACKAGE@/images/16x16
2
3	dist_pkgdata_DATA = $(srcdir)/*.png

Added Link Here

(-)old/src/plugins/contrib/FortranProject/images/Makefile.am (+5 lines)
1	SUBDIRS = 16x16 fortranproject
2
3	pkgdatadir = $(datadir)/@PACKAGE@/images
4
5	dist_pkgdata_DATA = $(srcdir)/*.png

Added Link Here

(-)old/src/plugins/contrib/FortranProject/images/fortranproject/Makefile.am (+3 lines)
1	pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject
2
3	dist_pkgdata_DATA = $(srcdir)/.png $(srcdir)/.f90

Lines 54-59 Link Here

(-)old/src/plugins/contrib/Makefile.am (+6 lines)
54	MAYBE_FILEMANAGER=FileManager appdata	54	MAYBE_FILEMANAGER=FileManager appdata
55	endif	55	endif
56		56
		57	if BUILD_FORTRANPROJECT
		58	MAYBE_FORTRANPROJECT=FortranProject appdata
		59	endif
		60
57	if BUILD_HELP	61	if BUILD_HELP
58	MAYBE_HELP=help_plugin appdata	62	MAYBE_HELP=help_plugin appdata
59	endif	63	endif
Lines 170-175 Link Here
170	$(MAYBE_EDITORTWEAKS) \	174	$(MAYBE_EDITORTWEAKS) \
171	$(MAYBE_ENVVARS) \	175	$(MAYBE_ENVVARS) \
172	$(MAYBE_FILEMANAGER) \	176	$(MAYBE_FILEMANAGER) \
		177	$(MAYBE_FORTRANPROJECT) \
173	$(MAYBE_HEADERFIXUP) \	178	$(MAYBE_HEADERFIXUP) \
174	$(MAYBE_HELP) \	179	$(MAYBE_HELP) \
175	$(MAYBE_HEXEDITOR) \	180	$(MAYBE_HEXEDITOR) \
Lines 212-217 Link Here
212	EditorTweaks \	217	EditorTweaks \
213	envvars \	218	envvars \
214	FileManager \	219	FileManager \
		220	FortranProject \
215	headerfixup \	221	headerfixup \
216	help_plugin \	222	help_plugin \
217	HexEditor \	223	HexEditor \

Return to bug 643494

Lines 345-350 Link Here

(-)old/m4/acinclude.m4 (-1 / +10 lines)
345	AM_CONDITIONAL([BUILD_EDITORTWEAKS], [false])	345	AM_CONDITIONAL([BUILD_EDITORTWEAKS], [false])
346	AM_CONDITIONAL([BUILD_ENVVARS], [false])	346	AM_CONDITIONAL([BUILD_ENVVARS], [false])
347	AM_CONDITIONAL([BUILD_FILEMANAGER], [false])	347	AM_CONDITIONAL([BUILD_FILEMANAGER], [false])
		348	AM_CONDITIONAL([BUILD_FORTRANPROJECT], [false])
348	AM_CONDITIONAL([BUILD_HEADERFIXUP], [false])	349	AM_CONDITIONAL([BUILD_HEADERFIXUP], [false])
349	AM_CONDITIONAL([BUILD_HELP], [false])	350	AM_CONDITIONAL([BUILD_HELP], [false])
350	AM_CONDITIONAL([BUILD_KEYBINDER], [false])	351	AM_CONDITIONAL([BUILD_KEYBINDER], [false])
Lines 387-392 Link Here
387	AM_CONDITIONAL([BUILD_EDITORTWEAKS], [true])	388	AM_CONDITIONAL([BUILD_EDITORTWEAKS], [true])
388	AM_CONDITIONAL([BUILD_ENVVARS], [true])	389	AM_CONDITIONAL([BUILD_ENVVARS], [true])
389	AM_CONDITIONAL([BUILD_FILEMANAGER], [true])	390	AM_CONDITIONAL([BUILD_FILEMANAGER], [true])
		391	AM_CONDITIONAL([BUILD_FORTRANPROJECT], [true])
390	AM_CONDITIONAL([BUILD_HEADERFIXUP], [true])	392	AM_CONDITIONAL([BUILD_HEADERFIXUP], [true])
391	AM_CONDITIONAL([BUILD_HELP], [true])	393	AM_CONDITIONAL([BUILD_HELP], [true])
392	AM_CONDITIONAL([BUILD_KEYBINDER], [true])	394	AM_CONDITIONAL([BUILD_KEYBINDER], [true])
Lines 427-433 Link Here
427	[ compiles none of the contrib-plugins ]	429	[ compiles none of the contrib-plugins ]
428	[ Plugin names are: AutoVersioning, BrowseTracker, byogames, Cccc, CppCheck, cbkoders, codesnippets, ]	430	[ Plugin names are: AutoVersioning, BrowseTracker, byogames, Cccc, CppCheck, cbkoders, codesnippets, ]
429	[ codestat, copystrings, Cscope, DoxyBlocks, dragscroll, EditorConfig, EditorTweaks, envvars, ]	431	[ codestat, copystrings, Cscope, DoxyBlocks, dragscroll, EditorConfig, EditorTweaks, envvars, ]
430	[ FileManager, headerfixup, help, hexeditor, incsearch, keybinder, libfinder, MouseSap, ]	432	[ FileManager, FortranProject, headerfixup, help, hexeditor, incsearch, keybinder, libfinder, MouseSap, ]
431	[ NassiShneiderman, ProjectOptionsManipulator, profiler, regex, ReopenEditor, exporter, smartindent, spellchecker, ]	433	[ NassiShneiderman, ProjectOptionsManipulator, profiler, regex, ReopenEditor, exporter, smartindent, spellchecker, ]
432	[ symtab, ThreadSearch, ToolsPlus, Valgrind, wxcontrib, wxsmith, wxsmithcontrib, wxsmithaui ],	434	[ symtab, ThreadSearch, ToolsPlus, Valgrind, wxcontrib, wxsmith, wxsmithcontrib, wxsmithaui ],
433	plugins="$withval", plugins="none")	435	plugins="$withval", plugins="none")
Lines 481-486 Link Here
481	FileManager)	483	FileManager)
482	AM_CONDITIONAL([BUILD_FILEMANAGER], [true])	484	AM_CONDITIONAL([BUILD_FILEMANAGER], [true])
483	;;	485	;;
		486	FortranProject)
		487	AM_CONDITIONAL([BUILD_FORTRANPROJECT], [true])
		488	;;
484	headerfixup)	489	headerfixup)
485	AM_CONDITIONAL([BUILD_HEADERFIXUP], [true])	490	AM_CONDITIONAL([BUILD_HEADERFIXUP], [true])
486	;;	491	;;
Lines 598-603 Link Here
598	-FileManager)	603	-FileManager)
599	AM_CONDITIONAL([BUILD_FILEMANAGER], [false])	604	AM_CONDITIONAL([BUILD_FILEMANAGER], [false])
600	;;	605	;;
		606	-FortranProject)
		607	AM_CONDITIONAL([BUILD_FORTRANPROJECT], [false])
		608	;;
601	-headerfixup)	609	-headerfixup)
602	AM_CONDITIONAL([BUILD_HEADERFIXUP], [false])	610	AM_CONDITIONAL([BUILD_HEADERFIXUP], [false])
603	;;	611	;;
Lines 700-705 Link Here
700	AC_SUBST(BUILD_EDITORTWEAKS)	708	AC_SUBST(BUILD_EDITORTWEAKS)
701	AC_SUBST(BUILD_ENVVARS)	709	AC_SUBST(BUILD_ENVVARS)
702	AC_SUBST(BUILD_FILEMANAGER)	710	AC_SUBST(BUILD_FILEMANAGER)
		711	AC_SUBST(BUILD_FORTRANPROJECT)
703	AC_SUBST(BUILD_HEADERFIXUP)	712	AC_SUBST(BUILD_HEADERFIXUP)
704	AC_SUBST(BUILD_HELP)	713	AC_SUBST(BUILD_HELP)
705	AC_SUBST(BUILD_HEXEDITOR)	714	AC_SUBST(BUILD_HEXEDITOR)

Added Link Here

(-)old/src/plugins/contrib/FortranProject/Makefile.am (+124 lines)
1	SUBDIRS = images
2
3	AM_CPPFLAGS = $(WX_CXXFLAGS) \
4	-I$(top_srcdir)/src/include \
5	-I$(top_srcdir)/src/include/tinyxml \
6	-I$(top_srcdir)/src/sdk/wxscintilla/include \
7	-I../FortranProject
8
9	pluginlibdir = $(pkglibdir)/plugins
10
11	pluginlib_LTLIBRARIES = libFortranProject.la
12
13	libFortranProject_la_LDFLAGS = @MODULE_SHARED_LDFLAGS@ -version-info 0:1:0 -no-undefined -avoid-version
14
15	libFortranProject_la_LIBADD = ../../../sdk/libcodeblocks.la \
16	$(WX_LIBS) \
17	$(CB_TINYXML_LIBS)
18
19	libFortranProject_la_SOURCES = autoinsert.cpp \
20	bindto.cpp \
21	bindtonewtype.cpp \
22	bufferparserthread.cpp \
23	calledbydict.cpp \
24	calltree.cpp \
25	calltreeview.cpp \
26	ccsmartfilter.cpp \
27	changecase.cpp \
28	constrhighlighter.cpp \
29	docblock.cpp \
30	farrays.cpp \
31	fconstruct.cpp \
32	finfowindow.cpp \
33	formatindent.cpp \
34	formatindentdlg.cpp \
35	fortranfileext.cpp \
36	fortranproject.cpp \
37	fpimagelist.cpp \
38	fpoptionsdlg.cpp \
39	includedb.cpp \
40	indentestimator.cpp \
41	jumptracker.cpp \
42	keywordsparserf.cpp \
43	lineaddress.cpp \
44	makefiledlg.cpp \
45	makefilegen.cpp \
46	moduletokenf.cpp \
47	nativeparserf.cpp \
48	parserf.cpp \
49	parserthreadf.cpp \
50	projectdependencies.cpp \
51	tab2space.cpp \
52	textcutter.cpp \
53	tokenf.cpp \
54	tokenizerf.cpp \
55	usetokenf.cpp \
56	workspacebrowserbuilder.cpp \
57	workspacebrowserf.cpp \
58	workspaceparserthread.cpp
59
60	noinst_HEADERS = autoinsert.h \
61	bindto.h \
62	bindtonewtype.h \
63	bufferparserthread.h \
64	calledbydict.h \
65	calltree.h \
66	calltreeview.h \
67	ccsmartfilter.h \
68	changecase.h \
69	constrhighlighter.h \
70	docblock.h \
71	farrays.h \
72	fconstruct.h \
73	finfowindow.h \
74	formatindent.h \
75	formatindentdlg.h \
76	fortranfileext.h \
77	fortranproject.h \
78	fpimagelist.h \
79	fpoptionsdlg.h \
80	includedb.h \
81	indentestimator.h \
82	jumptracker.h \
83	keywordsparserf.h \
84	lineaddress.h \
85	makefiledlg.h \
86	makefilegen.h \
87	moduletokenf.h \
88	nativeparserf.h \
89	parserf.h \
90	parserthreadf.h \
91	projectdependencies.h \
92	tab2space.h \
93	textcutter.h \
94	tokenf.h \
95	tokenizerf.h \
96	usetokenf.h \
97	workspacebrowserbuilder.h \
98	workspacebrowserf.h \
99	workspaceparserthread.h
100
101	EXTRA_DIST = $(srcdir)/*.cbp \
102	wxsmith/Bindto.wxs \
103	wxsmith/BindNewType.wxs \
104	wxsmith/FormatIndent.wxs \
105	wxsmith/MakefileDlg.wxs \
106	manifest.xml \
107	resources/changecase.xrc \
108	resources/fortranprojecttoolbar.xrc \
109	resources/settings.xrc \
110	resources/tab2space.xrc \
111	resources/workspacebrowserf.xrc \
112	update* \
113	images/*.png \
114	images/16x16/*.png \
115	images/fortranproject/*.png \
116	images/fortranproject/*.f90
117
118	pkgdata_DATA = FortranProject.zip
119
120	CLEANFILES = $(pkgdata_DATA)
121
122	FortranProject.zip: manifest.xml
123	PWD=`pwd` cd $(srcdir) && zip -j9 $(PWD)/FortranProject.zip manifest.xml resources/*.xrc > /dev/null
124	PWD=`pwd` cd $(srcdir) && zip -R9 $(PWD)/FortranProject.zip images/.png images/16x16/.png images/fortranproject/.png images/fortranproject/.f90 > /dev/null