GNOME.org
 

[grilomm] Update as in latest mm-common/skeletonmm.

commit 89afdae880c16b3be3e3dd7ce06f9eada771bf4e
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Fri Oct 12 16:13:20 2012 +0200

    Update as in latest mm-common/skeletonmm.
    
    * Makefile.am: Include build/dist-changelog.am.
    * codegen/Makefile.am: Include generate_defs_and_docs.sh in distribution.
    * codegen/generate_defs_and_docs.sh: Minor changes.
    * doc/reference/Doxyfile.in: Make it more like Doxyfile.in in glibmm and gtkmm.
    Add ALIAS for @newin with 3 arguments.
    * grilo/.gitignore: Remove /grilomm/grilo.[h|cc].
    * grilo/src/grilo_extra.defs: Rename to grilo/src/grilo_signal.defs.
    * grilo/src/grilo_vfunc.defs: New file.
    * grilo/src/filelist.am
    * grilo/src/grilo.defs: Update with new and renamed files.

 Makefile.am                                       |    2 +-
 codegen/Makefile.am                               |    5 ++-
 codegen/generate_defs_and_docs.sh                 |   26 +++++++++++++-------
 doc/reference/Doxyfile.in                         |   11 +++++----
 grilo/.gitignore                                  |    2 -
 grilo/src/filelist.am                             |   13 +++++-----
 grilo/src/grilo.defs                              |    3 +-
 grilo/src/{grilo_extra.defs => grilo_signal.defs} |    0
 grilo/src/grilo_vfunc.defs                        |   13 ++++++++++
 9 files changed, 49 insertions(+), 26 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 47171c7..9e4b284 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,4 +42,4 @@ pkgconfig_DATA = grilo/$(GRILOMM_MODULE_NAME).pc
 dist_noinst_SCRIPTS = autogen.sh
 
 # Optional: auto-generate the ChangeLog file from the git log on make dist
-#include $(top_srcdir)/build/dist-changelog.am
+include $(top_srcdir)/build/dist-changelog.am
diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index 60e4a99..85e7267 100644
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -19,8 +19,9 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 include $(srcdir)/m4/filelist.am
 
-dist_noinst_DATA = $(addprefix m4/,$(files_codegen_m4))
-noinst_PROGRAMS  = extradefs/generate_extra_defs
+dist_noinst_DATA    = $(addprefix m4/,$(files_codegen_m4))
+dist_noinst_SCRIPTS = generate_defs_and_docs.sh
+noinst_PROGRAMS     = extradefs/generate_extra_defs
 
 extradefs_generate_extra_defs_SOURCES = extradefs/generate_extra_defs_grilo.cc
 extradefs_generate_extra_defs_LDADD   = $(GRILOMM_LIBS) -lglibmm_generate_extra_defs-2.4
diff --git a/codegen/generate_defs_and_docs.sh b/codegen/generate_defs_and_docs.sh
index 1b2c5ee..164288c 100755
--- a/codegen/generate_defs_and_docs.sh
+++ b/codegen/generate_defs_and_docs.sh
@@ -10,22 +10,30 @@
 #   glibmm/tools/enum.pl
 #   grilo/src/*.h
 #   grilo/src/*.c
-#   grilo/doc/grilo/*.sgml
-#   grilo/doc/grilo/*.xml
 #   grilomm/codegen/extradefs/generate_extra_defs
 
 # Generated files:
 #   grilomm/grilo/src/grilo_docs.xml
-#   grilomm/grilo/src/grilo_method.defs
 #   grilomm/grilo/src/grilo_enum.defs
-#   grilomm/grilo/src/grilo_extra.defs  (signals and properties)
+#   grilomm/grilo/src/grilo_method.defs
+#   grilomm/grilo/src/grilo_signal.defs
 
 GLIBMM_TOOLS_DIR=../../glibmm/tools
 GRILO_DIR=../../grilo
-GRILOMM_SRC_DIR=../grilo/src
+GRILOMM_GRILO_SRC_DIR=../grilo/src
+
+$GLIBMM_TOOLS_DIR/defs_gen/docextract_to_xml.py \
+  -s $GRILO_DIR/src \
+  >$GRILOMM_GRILO_SRC_DIR/grilo_docs.xml
+
+$GLIBMM_TOOLS_DIR/enum.pl \
+  $GRILO_DIR/src/*.h \
+  >$GRILOMM_GRILO_SRC_DIR/grilo_enum.defs
+
+$GLIBMM_TOOLS_DIR/defs_gen/h2def.py \
+  $GRILO_DIR/src/*.h \
+  >$GRILOMM_GRILO_SRC_DIR/grilo_method.defs
 
-$GLIBMM_TOOLS_DIR/defs_gen/docextract_to_xml.py -s $GRILO_DIR/src -s $GRILO_DIR/doc/grilo >$GRILOMM_SRC_DIR/grilo_docs.xml
-$GLIBMM_TOOLS_DIR/defs_gen/h2def.py $GRILO_DIR/src/*.h >$GRILOMM_SRC_DIR/grilo_method.defs
-$GLIBMM_TOOLS_DIR/enum.pl $GRILO_DIR/src/*.h >$GRILOMM_SRC_DIR/grilo_enum.defs
-extradefs/generate_extra_defs >$GRILOMM_SRC_DIR/grilo_extra.defs
+extradefs/generate_extra_defs \
+  >$GRILOMM_GRILO_SRC_DIR/grilo_signal.defs
 
diff --git a/doc/reference/Doxyfile.in b/doc/reference/Doxyfile.in
index fd04374..1c57cf8 100644
--- a/doc/reference/Doxyfile.in
+++ b/doc/reference/Doxyfile.in
@@ -32,6 +32,7 @@ INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 8
 ALIASES                = "newin{2}=\xrefitem since_\1_\2 \"Since @PACKAGE_NAME@ \1.\2\" \"New API in @PACKAGE_NAME@ \1.\2\""
+ALIASES               += "newin{3}=\xrefitem since_\1_\2_\3 \"Since @PACKAGE_NAME@ \1.\2.\3\" \"New API in @PACKAGE_NAME@ \1.\2.\3\""
 OPTIMIZE_OUTPUT_FOR_C  = NO
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
@@ -54,8 +55,8 @@ EXTRACT_STATIC         = NO
 EXTRACT_LOCAL_CLASSES  = NO
 EXTRACT_LOCAL_METHODS  = NO
 EXTRACT_ANON_NSPACES   = NO
-HIDE_UNDOC_MEMBERS     = YES
-HIDE_UNDOC_CLASSES     = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = YES
 HIDE_IN_BODY_DOCS      = YES
 INTERNAL_DOCS          = NO
@@ -87,7 +88,7 @@ QUIET                  = NO
 WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = YES
+WARN_NO_PARAMDOC       = NO
 WARN_FORMAT            = "$file:$line: $text"
 WARN_LOGFILE           = reference/doxygen.log
 #---------------------------------------------------------------------------
@@ -131,7 +132,7 @@ VERBATIM_HEADERS       = NO
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
+ALPHABETICAL_INDEX     = YES
 COLS_IN_ALPHA_INDEX    = 5
 IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
@@ -165,7 +166,7 @@ QHP_SECT_FILTER_ATTRS  =
 QHG_LOCATION           =
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 1
-GENERATE_TREEVIEW      = NONE
+GENERATE_TREEVIEW      = NO
 USE_INLINE_TREES       = NO
 TREEVIEW_WIDTH         = 250
 FORMULA_FONTSIZE       = 10
diff --git a/grilo/.gitignore b/grilo/.gitignore
index ea720e0..400bec4 100644
--- a/grilo/.gitignore
+++ b/grilo/.gitignore
@@ -6,7 +6,5 @@
 /grilomm/registry.cc
 /grilomm/source.h
 /grilomm/source.cc
-/grilomm/grilo.cc
-/grilomm/grilo.h
 /grilomm/wrap_init.cc
 /src/.stamps/
diff --git a/grilo/src/filelist.am b/grilo/src/filelist.am
index a99e993..82c676f 100644
--- a/grilo/src/filelist.am
+++ b/grilo/src/filelist.am
@@ -1,11 +1,12 @@
 ## This file is part of grilomm.
 
-files_defs =			\
-	grilo.defs		\
-	grilo_enum.defs	\
-	grilo_extra.defs	\
-	grilo_method.defs	\
-	grilo_docs.xml
+files_defs =        \
+  grilo.defs        \
+  grilo_enum.defs   \
+  grilo_method.defs \
+  grilo_signal.defs \
+  grilo_vfunc.defs  \
+  grilo_docs.xml
 
 files_hg  = plugin.hg registry.hg source.hg
 files_ccg = $(files_hg:.hg=.ccg)
diff --git a/grilo/src/grilo.defs b/grilo/src/grilo.defs
index bbfd960..fabd9e5 100644
--- a/grilo/src/grilo.defs
+++ b/grilo/src/grilo.defs
@@ -1,4 +1,5 @@
 ;; Include generated API definition files
 (include grilo_enum.defs)
 (include grilo_method.defs)
-(include grilo_extra.defs)
+(include grilo_signal.defs)
+(include grilo_vfunc.defs)
diff --git a/grilo/src/grilo_extra.defs b/grilo/src/grilo_signal.defs
similarity index 100%
rename from grilo/src/grilo_extra.defs
rename to grilo/src/grilo_signal.defs
diff --git a/grilo/src/grilo_vfunc.defs b/grilo/src/grilo_vfunc.defs
new file mode 100644
index 0000000..9ba394a
--- /dev/null
+++ b/grilo/src/grilo_vfunc.defs
@@ -0,0 +1,13 @@
+; Virtual functions
+; Hand-written file
+
+; GriloSomeType
+
+;(define-vfunc some_vfunc
+;  (of-object "GriloSomeType")
+;  (return-type "void")
+;  (parameters
+;    '("GObject*" "some_object")
+;    '("const-gchar*" "some_string")
+;  )
+;)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]