View | Details | Raw Unified | Return to bug 34891
Collapse All | Expand All

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