Menu
▾
▴
cutter-commit — A ML for commit mails
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(52) |
Nov
(902) |
Dec
(89) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(10) |
Feb
(103) |
Mar
(216) |
Apr
(184) |
May
(435) |
Jun
(123) |
Jul
(145) |
Aug
(107) |
Sep
(53) |
Oct
(140) |
Nov
(59) |
Dec
(40) |
| 2009 |
Jan
(28) |
Feb
(39) |
Mar
(70) |
Apr
(35) |
May
(146) |
Jun
(23) |
Jul
(6) |
Aug
(110) |
Sep
(65) |
Oct
(111) |
Nov
(127) |
Dec
(1) |
| 2010 |
Jan
(12) |
Feb
(2) |
Mar
(56) |
Apr
(123) |
May
(13) |
Jun
(120) |
Jul
(42) |
Aug
(2) |
Sep
(23) |
Oct
(3) |
Nov
(10) |
Dec
(1) |
| 2011 |
Jan
(9) |
Feb
(99) |
Mar
(3) |
Apr
(1) |
May
(18) |
Jun
|
Jul
(43) |
Aug
(1) |
Sep
(1) |
Oct
(34) |
Nov
(7) |
Dec
(74) |
| 2012 |
Jan
(10) |
Feb
(10) |
Mar
(71) |
Apr
(1) |
May
(9) |
Jun
(8) |
Jul
(2) |
Aug
(97) |
Sep
(1) |
Oct
(16) |
Nov
(3) |
Dec
(33) |
| 2013 |
Jan
(26) |
Feb
(3) |
Mar
|
Apr
(4) |
May
(9) |
Jun
(2) |
Jul
(6) |
Aug
(2) |
Sep
|
Oct
|
Nov
(32) |
Dec
(2) |
| 2014 |
Jan
(38) |
Feb
(39) |
Mar
|
Apr
|
May
(11) |
Jun
(22) |
Jul
|
Aug
(3) |
Sep
(3) |
Oct
(7) |
Nov
|
Dec
|
| 2015 |
Jan
(3) |
Feb
(1) |
Mar
(12) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Kouhei S. <nul...@cl...> - 2013-08-05 12:49:00
|
Kouhei Sutou 2013-08-05 21:48:43 +0900 (Mon, 05 Aug 2013) New Revision: b8ae91d7e7883c99268ed21a90cf5402fb8c2e4f https://github.com/clear-code/cutter/commit/b8ae91d7e7883c99268ed21a90cf5402fb8c2e4f Message: Merge pull request #6 from myokoym/html-remove-a-needless-period html: remove a needless period Patch by Masafumi Yokoyama. Thanks!!! |
|
From: Kouhei S. <nul...@cl...> - 2013-07-18 14:53:16
|
Kouhei Sutou 2013-07-18 23:52:44 +0900 (Thu, 18 Jul 2013) New Revision: 342f6c8d6665376e77756fec050d359cbd40ef60 https://github.com/clear-code/cutter/commit/342f6c8d6665376e77756fec050d359cbd40ef60 Message: Reset "Release" version to "1" for RPM Modified files: misc/update-latest-release.rb Modified: misc/update-latest-release.rb (+2 -0) =================================================================== --- misc/update-latest-release.rb 2013-07-13 22:58:45 +0900 (83066b8) +++ misc/update-latest-release.rb 2013-07-18 23:52:44 +0900 (7577663) @@ -40,6 +40,8 @@ files.each do |file| EOC end + replaced_content = replaced_content.sub(/^(Release:\s+)\d+/, + "\\11") when /debian\/changelog\z/ date = Time.parse(new_release_date).rfc2822 if content !~ /#{Regexp.escape(new_version)}/ |
|
From: Kouhei S. <nul...@cl...> - 2013-07-13 13:59:07
|
Kouhei Sutou 2013-07-13 22:58:45 +0900 (Sat, 13 Jul 2013) New Revision: f7eeb00cf4fa20b2b83b64f0b43942279650927b https://github.com/clear-code/cutter/commit/f7eeb00cf4fa20b2b83b64f0b43942279650927b Message: Remove needless AM_INIT_AUTOMAKE arguments configure.ac:19: warning: AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated. For more info, see: configure.ac:19: http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation Modified files: configure.ac Modified: configure.ac (+1 -1) =================================================================== --- configure.ac 2013-07-13 22:56:32 +0900 (04ddadf) +++ configure.ac 2013-07-13 22:58:45 +0900 (89d6b9b) @@ -16,7 +16,7 @@ AC_CONFIG_MACRO_DIR([acmacros]) AC_CONFIG_SRCDIR([cutter/cut-main.c]) AM_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION) +AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) PACKAGE_TITLE=Cutter |
|
From: Kouhei S. <nul...@cl...> - 2013-07-13 13:56:58
|
Kouhei Sutou 2013-07-13 22:56:32 +0900 (Sat, 13 Jul 2013) New Revision: 30d470bbaf6ccf8ffb79000fd80ee77ec0284dfa https://github.com/clear-code/cutter/commit/30d470bbaf6ccf8ffb79000fd80ee77ec0284dfa Message: Use "AM_CPPFLAGS" instead of "INCLUDES" Because "INCLUDES" is old API. cutter/Makefile.am:1: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') Modified files: cppcutter/Makefile.am cutter/Makefile.am doc/reference/Makefile.am gcutter/Makefile.am gdkcutter-pixbuf/Makefile.am glib-compatible/Makefile.am glib-compatible/pcre/Makefile.am gst-plugins/Makefile.am gst-plugins/test/Makefile.am module/report/Makefile.am module/stream/Makefile.am module/ui/Makefile.am sample/glib/Makefile.am sample/gtk+/Makefile.am sample/stack/test/Makefile.am soupcutter/Makefile.am test/cppcutter/Makefile.am test/cutter/Makefile.am test/fixtures/factory/type1/Makefile.am test/fixtures/factory/type2/Makefile.am test/fixtures/loader/attribute/Makefile.am test/fixtures/loader/cpp-fixture/Makefile.am test/fixtures/loader/cpp/Makefile.am test/fixtures/loader/fixture/Makefile.am test/fixtures/loader/iterator/Makefile.am test/fixtures/loader/module/Makefile.am test/fixtures/loader/suite/Makefile.am test/fixtures/loader/test/Makefile.am test/fixtures/path/parent/sub/Makefile.am test/fixtures/pipeline/error/Makefile.am test/fixtures/pipeline/failure/Makefile.am test/fixtures/pipeline/omission/Makefile.am test/fixtures/pipeline/pending/Makefile.am test/fixtures/pipeline/setup-error/Makefile.am test/fixtures/pipeline/success/Makefile.am test/fixtures/repository/Makefile.am test/fixtures/sub-process-group/Makefile.am test/fixtures/sub-process-group/fixtures/normal/Makefile.am test/fixtures/sub-process/Makefile.am test/fixtures/sub-process/fixtures/normal/Makefile.am test/fixtures/test-context/Makefile.am test/fixtures/test-directory/Makefile.am test/fixtures/thread/failure/Makefile.am test/gcutter/Makefile.am test/gdkcutter-pixbuf/Makefile.am test/lib/Makefile.am test/lib/cuttest-echo/Makefile.am test/soupcutter/Makefile.am Modified: cppcutter/Makefile.am (+1 -1) =================================================================== --- cppcutter/Makefile.am 2013-07-13 22:52:44 +0900 (9cf6ed9) +++ cppcutter/Makefile.am 2013-07-13 22:56:32 +0900 (6f3731e) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: cutter/Makefile.am (+1 -1) =================================================================== --- cutter/Makefile.am 2013-07-13 22:52:44 +0900 (d513b05) +++ cutter/Makefile.am 2013-07-13 22:56:32 +0900 (92a58d6) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) Modified: doc/reference/Makefile.am (+1 -1) =================================================================== --- doc/reference/Makefile.am 2013-07-13 22:52:44 +0900 (0549a70) +++ doc/reference/Makefile.am 2013-07-13 22:56:32 +0900 (5e45111) @@ -133,7 +133,7 @@ IGNORE_HFILES= \ cppcut-message.h \ gbsearcharray.h -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/cutter \ -I$(top_srcdir)/gcutter \ -I$(top_srcdir)/cppcutter \ Modified: gcutter/Makefile.am (+1 -1) =================================================================== --- gcutter/Makefile.am 2013-07-13 22:52:44 +0900 (0ff3b01) +++ gcutter/Makefile.am 2013-07-13 22:56:32 +0900 (e50c4b4) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: gdkcutter-pixbuf/Makefile.am (+1 -1) =================================================================== --- gdkcutter-pixbuf/Makefile.am 2013-07-13 22:52:44 +0900 (1d4dd97) +++ gdkcutter-pixbuf/Makefile.am 2013-07-13 22:56:32 +0900 (cea1873) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: glib-compatible/Makefile.am (+1 -1) =================================================================== --- glib-compatible/Makefile.am 2013-07-13 22:52:44 +0900 (d241b42) +++ glib-compatible/Makefile.am 2013-07-13 22:56:32 +0900 (53d3015) @@ -1,7 +1,7 @@ SUBDIRS = \ pcre -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) AM_CFLAGS = \ Modified: glib-compatible/pcre/Makefile.am (+1 -1) =================================================================== --- glib-compatible/pcre/Makefile.am 2013-07-13 22:52:44 +0900 (c1bc425) +++ glib-compatible/pcre/Makefile.am 2013-07-13 22:56:32 +0900 (822c92b) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"GLib-GRegex\" \ -DSUPPORT_UCP \ -DSUPPORT_UTF8 \ Modified: gst-plugins/Makefile.am (+1 -1) =================================================================== --- gst-plugins/Makefile.am 2013-07-13 22:52:44 +0900 (24992bd) +++ gst-plugins/Makefile.am 2013-07-13 22:56:32 +0900 (1a76a8d) @@ -9,7 +9,7 @@ noinst_HEADERS = \ gst-cutter-console-output.h \ gst-cutter-server.h -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) Modified: gst-plugins/test/Makefile.am (+1 -1) =================================================================== --- gst-plugins/test/Makefile.am 2013-07-13 22:52:44 +0900 (eb2ff6a) +++ gst-plugins/test/Makefile.am 2013-07-13 22:56:32 +0900 (6f91bee) @@ -1,5 +1,5 @@ if HAVE_GSTREAMER -INCLUDES = $(CUTTER_CFLAGS) \ +AM_CPPFLAGS = $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: module/report/Makefile.am (+1 -1) =================================================================== --- module/report/Makefile.am 2013-07-13 22:52:44 +0900 (0237951) +++ module/report/Makefile.am 2013-07-13 22:56:32 +0900 (6b7ff64) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) Modified: module/stream/Makefile.am (+1 -1) =================================================================== --- module/stream/Makefile.am 2013-07-13 22:52:44 +0900 (3c2974b) +++ module/stream/Makefile.am 2013-07-13 22:56:32 +0900 (fd7e996) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) Modified: module/ui/Makefile.am (+1 -1) =================================================================== --- module/ui/Makefile.am 2013-07-13 22:52:44 +0900 (7ddbe29) +++ module/ui/Makefile.am 2013-07-13 22:56:32 +0900 (7709cd5) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) Modified: sample/glib/Makefile.am (+1 -1) =================================================================== --- sample/glib/Makefile.am 2013-07-13 22:52:44 +0900 (c8a9f6b) +++ sample/glib/Makefile.am 2013-07-13 22:56:32 +0900 (b549fbe) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter \ Modified: sample/gtk+/Makefile.am (+1 -1) =================================================================== --- sample/gtk+/Makefile.am 2013-07-13 22:52:44 +0900 (45fa7f1) +++ sample/gtk+/Makefile.am 2013-07-13 22:56:32 +0900 (2b5fbd1) @@ -5,7 +5,7 @@ TESTS_ENVIRONMENT = NO_MAKE=yes EXTRA_DIST = run-test.sh -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: sample/stack/test/Makefile.am (+1 -1) =================================================================== --- sample/stack/test/Makefile.am 2013-07-13 22:52:44 +0900 (c94e85a) +++ sample/stack/test/Makefile.am 2013-07-13 22:56:32 +0900 (7efc928) @@ -5,7 +5,7 @@ TESTS_ENVIRONMENT = NO_MAKE=yes CUTTER="$(CUTTER)" noinst_LTLIBRARIES = test_stack.la endif -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src LIBS = $(CUTTER_LIBS) $(top_builddir)/src/libstack.la AM_CFLAGS = $(CUTTER_CFLAGS) Modified: soupcutter/Makefile.am (+1 -1) =================================================================== --- soupcutter/Makefile.am 2013-07-13 22:52:44 +0900 (2496279) +++ soupcutter/Makefile.am 2013-07-13 22:56:32 +0900 (77b4339) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter \ Modified: test/cppcutter/Makefile.am (+1 -1) =================================================================== --- test/cppcutter/Makefile.am 2013-07-13 22:52:44 +0900 (deb7c45) +++ test/cppcutter/Makefile.am 2013-07-13 22:56:32 +0900 (8376641) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter \ Modified: test/cutter/Makefile.am (+1 -1) =================================================================== --- test/cutter/Makefile.am 2013-07-13 22:52:44 +0900 (e779b42) +++ test/cutter/Makefile.am 2013-07-13 22:56:32 +0900 (284fb0c) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter \ Modified: test/fixtures/factory/type1/Makefile.am (+1 -1) =================================================================== --- test/fixtures/factory/type1/Makefile.am 2013-07-13 22:52:44 +0900 (1e28de9) +++ test/fixtures/factory/type1/Makefile.am 2013-07-13 22:56:32 +0900 (6676c72) @@ -1,4 +1,4 @@ -INCLUDES = $(CUTTER_CFLAGS) \ +AM_CPPFLAGS = $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: test/fixtures/factory/type2/Makefile.am (+1 -1) =================================================================== --- test/fixtures/factory/type2/Makefile.am 2013-07-13 22:52:44 +0900 (667d6c2) +++ test/fixtures/factory/type2/Makefile.am 2013-07-13 22:56:32 +0900 (6c1df0d) @@ -1,4 +1,4 @@ -INCLUDES = $(CUTTER_CFLAGS) \ +AM_CPPFLAGS = $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: test/fixtures/loader/attribute/Makefile.am (+1 -1) =================================================================== --- test/fixtures/loader/attribute/Makefile.am 2013-07-13 22:52:44 +0900 (86adc15) +++ test/fixtures/loader/attribute/Makefile.am 2013-07-13 22:56:32 +0900 (c59ac43) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ Modified: test/fixtures/loader/cpp-fixture/Makefile.am (+1 -1) =================================================================== --- test/fixtures/loader/cpp-fixture/Makefile.am 2013-07-13 22:52:44 +0900 (4ecf288) +++ test/fixtures/loader/cpp-fixture/Makefile.am 2013-07-13 22:56:32 +0900 (cbcc162) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ Modified: test/fixtures/loader/cpp/Makefile.am (+1 -1) =================================================================== --- test/fixtures/loader/cpp/Makefile.am 2013-07-13 22:52:44 +0900 (0b3d2b1) +++ test/fixtures/loader/cpp/Makefile.am 2013-07-13 22:56:32 +0900 (d4c605e) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ Modified: test/fixtures/loader/fixture/Makefile.am (+1 -1) =================================================================== --- test/fixtures/loader/fixture/Makefile.am 2013-07-13 22:52:44 +0900 (b43d333) +++ test/fixtures/loader/fixture/Makefile.am 2013-07-13 22:56:32 +0900 (79ece88) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ Modified: test/fixtures/loader/iterator/Makefile.am (+1 -1) =================================================================== --- test/fixtures/loader/iterator/Makefile.am 2013-07-13 22:52:44 +0900 (2d2e584) +++ test/fixtures/loader/iterator/Makefile.am 2013-07-13 22:56:32 +0900 (698de3f) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ Modified: test/fixtures/loader/module/Makefile.am (+1 -1) =================================================================== --- test/fixtures/loader/module/Makefile.am 2013-07-13 22:52:44 +0900 (5d5abb0) +++ test/fixtures/loader/module/Makefile.am 2013-07-13 22:56:32 +0900 (73a7975) @@ -1,4 +1,4 @@ -INCLUDES = $(CUTTER_CFLAGS) \ +AM_CPPFLAGS = $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: test/fixtures/loader/suite/Makefile.am (+1 -1) =================================================================== --- test/fixtures/loader/suite/Makefile.am 2013-07-13 22:52:44 +0900 (2c59c9c) +++ test/fixtures/loader/suite/Makefile.am 2013-07-13 22:56:32 +0900 (491299d) @@ -1,4 +1,4 @@ -INCLUDES = $(CUTTER_CFLAGS) \ +AM_CPPFLAGS = $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: test/fixtures/loader/test/Makefile.am (+1 -1) =================================================================== --- test/fixtures/loader/test/Makefile.am 2013-07-13 22:52:44 +0900 (cfe842c) +++ test/fixtures/loader/test/Makefile.am 2013-07-13 22:56:32 +0900 (be80c34) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ Modified: test/fixtures/path/parent/sub/Makefile.am (+1 -1) =================================================================== --- test/fixtures/path/parent/sub/Makefile.am 2013-07-13 22:52:44 +0900 (dba952f) +++ test/fixtures/path/parent/sub/Makefile.am 2013-07-13 22:56:32 +0900 (0315ce5) @@ -1,4 +1,4 @@ -INCLUDES = $(CUTTER_CFLAGS) \ +AM_CPPFLAGS = $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: test/fixtures/pipeline/error/Makefile.am (+1 -1) =================================================================== --- test/fixtures/pipeline/error/Makefile.am 2013-07-13 22:52:44 +0900 (7ddf006) +++ test/fixtures/pipeline/error/Makefile.am 2013-07-13 22:56:32 +0900 (1019d94) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ Modified: test/fixtures/pipeline/failure/Makefile.am (+1 -1) =================================================================== --- test/fixtures/pipeline/failure/Makefile.am 2013-07-13 22:52:44 +0900 (9bba348) +++ test/fixtures/pipeline/failure/Makefile.am 2013-07-13 22:56:32 +0900 (465fbb4) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ Modified: test/fixtures/pipeline/omission/Makefile.am (+1 -1) =================================================================== --- test/fixtures/pipeline/omission/Makefile.am 2013-07-13 22:52:44 +0900 (a987430) +++ test/fixtures/pipeline/omission/Makefile.am 2013-07-13 22:56:32 +0900 (6fc182b) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ Modified: test/fixtures/pipeline/pending/Makefile.am (+1 -1) =================================================================== --- test/fixtures/pipeline/pending/Makefile.am 2013-07-13 22:52:44 +0900 (bf60ad7) +++ test/fixtures/pipeline/pending/Makefile.am 2013-07-13 22:56:32 +0900 (1d09073) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ Modified: test/fixtures/pipeline/setup-error/Makefile.am (+1 -1) =================================================================== --- test/fixtures/pipeline/setup-error/Makefile.am 2013-07-13 22:52:44 +0900 (69b1812) +++ test/fixtures/pipeline/setup-error/Makefile.am 2013-07-13 22:56:32 +0900 (1ab0eb1) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ Modified: test/fixtures/pipeline/success/Makefile.am (+1 -1) =================================================================== --- test/fixtures/pipeline/success/Makefile.am 2013-07-13 22:52:44 +0900 (153a4be) +++ test/fixtures/pipeline/success/Makefile.am 2013-07-13 22:56:32 +0900 (e4ee694) @@ -1,4 +1,4 @@ -INCLUDES = $(CUTTER_CFLAGS) \ +AM_CPPFLAGS = $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: test/fixtures/repository/Makefile.am (+1 -1) =================================================================== --- test/fixtures/repository/Makefile.am 2013-07-13 22:52:44 +0900 (9997afd) +++ test/fixtures/repository/Makefile.am 2013-07-13 22:56:32 +0900 (5efa822) @@ -1,4 +1,4 @@ -INCLUDES = $(CUTTER_CFLAGS) \ +AM_CPPFLAGS = $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: test/fixtures/sub-process-group/Makefile.am (+1 -1) =================================================================== --- test/fixtures/sub-process-group/Makefile.am 2013-07-13 22:52:44 +0900 (af35560) +++ test/fixtures/sub-process-group/Makefile.am 2013-07-13 22:56:32 +0900 (32dcc9e) @@ -1,6 +1,6 @@ SUBDIRS = fixtures -INCLUDES = $(CUTTER_CFLAGS) \ +AM_CPPFLAGS = $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter \ Modified: test/fixtures/sub-process-group/fixtures/normal/Makefile.am (+1 -1) =================================================================== --- test/fixtures/sub-process-group/fixtures/normal/Makefile.am 2013-07-13 22:52:44 +0900 (72b57a4) +++ test/fixtures/sub-process-group/fixtures/normal/Makefile.am 2013-07-13 22:56:32 +0900 (1e1ec8d) @@ -1,4 +1,4 @@ -INCLUDES = $(CUTTER_CFLAGS) \ +AM_CPPFLAGS = $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: test/fixtures/sub-process/Makefile.am (+1 -1) =================================================================== --- test/fixtures/sub-process/Makefile.am 2013-07-13 22:52:44 +0900 (af35560) +++ test/fixtures/sub-process/Makefile.am 2013-07-13 22:56:32 +0900 (32dcc9e) @@ -1,6 +1,6 @@ SUBDIRS = fixtures -INCLUDES = $(CUTTER_CFLAGS) \ +AM_CPPFLAGS = $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter \ Modified: test/fixtures/sub-process/fixtures/normal/Makefile.am (+1 -1) =================================================================== --- test/fixtures/sub-process/fixtures/normal/Makefile.am 2013-07-13 22:52:44 +0900 (72b57a4) +++ test/fixtures/sub-process/fixtures/normal/Makefile.am 2013-07-13 22:56:32 +0900 (1e1ec8d) @@ -1,4 +1,4 @@ -INCLUDES = $(CUTTER_CFLAGS) \ +AM_CPPFLAGS = $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: test/fixtures/test-context/Makefile.am (+1 -1) =================================================================== --- test/fixtures/test-context/Makefile.am 2013-07-13 22:52:44 +0900 (d9d52ec) +++ test/fixtures/test-context/Makefile.am 2013-07-13 22:56:32 +0900 (fdb1677) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter \ Modified: test/fixtures/test-directory/Makefile.am (+1 -1) =================================================================== --- test/fixtures/test-directory/Makefile.am 2013-07-13 22:52:44 +0900 (df60935) +++ test/fixtures/test-directory/Makefile.am 2013-07-13 22:56:32 +0900 (2278c8a) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter \ Modified: test/fixtures/thread/failure/Makefile.am (+1 -1) =================================================================== --- test/fixtures/thread/failure/Makefile.am 2013-07-13 22:52:44 +0900 (b1af2e2) +++ test/fixtures/thread/failure/Makefile.am 2013-07-13 22:56:32 +0900 (fa0dc3d) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter \ Modified: test/gcutter/Makefile.am (+1 -1) =================================================================== --- test/gcutter/Makefile.am 2013-07-13 22:52:44 +0900 (0c6ccb8) +++ test/gcutter/Makefile.am 2013-07-13 22:56:32 +0900 (3e5dd68) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter \ Modified: test/gdkcutter-pixbuf/Makefile.am (+1 -1) =================================================================== --- test/gdkcutter-pixbuf/Makefile.am 2013-07-13 22:52:44 +0900 (095dc6c) +++ test/gdkcutter-pixbuf/Makefile.am 2013-07-13 22:56:32 +0900 (4d45e37) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter \ Modified: test/lib/Makefile.am (+1 -1) =================================================================== --- test/lib/Makefile.am 2013-07-13 22:52:44 +0900 (f165490) +++ test/lib/Makefile.am 2013-07-13 22:56:32 +0900 (618442c) @@ -1,7 +1,7 @@ SUBDIRS = \ cuttest-echo -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter \ Modified: test/lib/cuttest-echo/Makefile.am (+1 -1) =================================================================== --- test/lib/cuttest-echo/Makefile.am 2013-07-13 22:52:44 +0900 (3ea409b) +++ test/lib/cuttest-echo/Makefile.am 2013-07-13 22:56:32 +0900 (caa4a21) @@ -1,4 +1,4 @@ -INCLUDES = $(CUTTER_CFLAGS) \ +AM_CPPFLAGS = $(CUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter Modified: test/soupcutter/Makefile.am (+1 -1) =================================================================== --- test/soupcutter/Makefile.am 2013-07-13 22:52:44 +0900 (2d6779b) +++ test/soupcutter/Makefile.am 2013-07-13 22:56:32 +0900 (99d39b5) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/cutter \ |
|
From: Kouhei S. <nul...@cl...> - 2013-07-13 13:53:04
|
Kouhei Sutou 2013-07-13 22:52:44 +0900 (Sat, 13 Jul 2013) New Revision: 9c58cdead56ca3182a212045f612a7549671ae74 https://github.com/clear-code/cutter/commit/9c58cdead56ca3182a212045f612a7549671ae74 Message: Use GLib compatible API to suppress warnings cut-xml-stream.c: In function 'init': cut-xml-stream.c:138:5: warning: 'g_mutex_new' is deprecated (declared at /usr/include/glib-2.0/glib/deprecated/gthread.h:272) [-Wdeprecated-declarations] stream->mutex = g_mutex_new(); ^ cut-xml-stream.c: In function 'dispose': cut-xml-stream.c:222:9: warning: 'g_mutex_free' is deprecated (declared at /usr/include/glib-2.0/glib/deprecated/gthread.h:274) [-Wdeprecated-declarations] g_mutex_free(stream->mutex); ^ Modified files: module/stream/cut-xml-stream.c Modified: module/stream/cut-xml-stream.c (+2 -1) =================================================================== --- module/stream/cut-xml-stream.c 2013-07-13 22:50:39 +0900 (4ab3885) +++ module/stream/cut-xml-stream.c 2013-07-13 22:52:44 +0900 (c1ba55b) @@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Copyright (C) 2008 g新部 Hiroyuki Ikezoe <poi...@ik...> - * Copyright (C) 2011 Kouhei Sutou <ko...@cl...> + * Copyright (C) 2011-2013 Kouhei Sutou <ko...@cl...> * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -35,6 +35,7 @@ #include <cutter/cut-test-result.h> #include <cutter/cut-enum-types.h> #include <cutter/cut-utils.h> +#include <cutter/cut-glib-compatible.h> #define CUT_TYPE_XML_STREAM cut_type_xml_stream #define CUT_XML_STREAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CUT_TYPE_XML_STREAM, CutXMLStream)) |
|
From: Kouhei S. <nul...@cl...> - 2013-07-13 13:51:02
|
Kouhei Sutou 2013-07-13 22:50:39 +0900 (Sat, 13 Jul 2013) New Revision: c1fb8b656d1637ad65e28fde2c9a4df04b78f406 https://github.com/clear-code/cutter/commit/c1fb8b656d1637ad65e28fde2c9a4df04b78f406 Message: Use GLib compatible API to suppress warnings cut-run-context.c: In function 'cut_run_context_init': cut-run-context.c:965:5: warning: implicit declaration of function 'g_mutex_new' [-Wimplicit-function-declaration] priv->mutex = g_mutex_new(); ^ cut-run-context.c:965:17: warning: assignment makes pointer from integer without a cast [enabled by default] priv->mutex = g_mutex_new(); ^ cut-run-context.c: In function 'dispose': cut-run-context.c:1014:9: warning: implicit declaration of function 'g_mutex_free' [-Wimplicit-function-declaration] g_mutex_free(priv->mutex); ^ Modified files: cutter/cut-run-context.c Modified: cutter/cut-run-context.c (+2 -1) =================================================================== --- cutter/cut-run-context.c 2013-07-13 22:49:00 +0900 (a0f4687) +++ cutter/cut-run-context.c 2013-07-13 22:50:39 +0900 (2addf3b) @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2008-2010 Kouhei Sutou <ko...@cl...> + * Copyright (C) 2008-2013 Kouhei Sutou <ko...@cl...> * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -32,6 +32,7 @@ #include "cut-repository.h" #include "cut-test-case.h" #include "cut-test-result.h" +#include "cut-glib-compatible.h" #include "cut-enum-types.h" #include <gcutter/gcut-marshalers.h> |
|
From: Kouhei S. <nul...@cl...> - 2013-07-13 13:49:29
|
Kouhei Sutou 2013-07-13 22:49:00 +0900 (Sat, 13 Jul 2013) New Revision: 4e7a5f9725c896ab22dcbb7d90501a53297b5c6d https://github.com/clear-code/cutter/commit/4e7a5f9725c896ab22dcbb7d90501a53297b5c6d Message: Extract backward compatible codes for GLib 2.32 API change Added files: cutter/cut-glib-compatible.c cutter/cut-glib-compatible.h Modified files: cutter/Makefile.am cutter/cut-test-context.c Modified: cutter/Makefile.am (+2 -0) =================================================================== --- cutter/Makefile.am 2013-06-26 10:19:49 +0900 (fa46c05) +++ cutter/Makefile.am 2013-07-13 22:49:00 +0900 (d513b05) @@ -77,6 +77,7 @@ libcutter_public_headers = \ noinst_headers = \ cut-crash-backtrace.h \ cut-elf-loader.h \ + cut-glib-compatible.h \ cut-loader.h \ cut-mach-o-loader.h \ cut-module-impl.h \ @@ -131,6 +132,7 @@ libcutter_sources = \ cut-elf-loader.c \ cut-factory-builder.c \ cut-file-stream-reader.c \ + cut-glib-compatible.c \ cut-helper.c \ cut-iterated-test.c \ cut-listener.c \ Added: cutter/cut-glib-compatible.c (+46 -0) 100644 =================================================================== --- /dev/null +++ cutter/cut-glib-compatible.c 2013-07-13 22:49:00 +0900 (73c3063) @@ -0,0 +1,46 @@ +/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Copyright (C) 2013 Kouhei Sutou <ko...@cl...> + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif /* HAVE_CONFIG_H */ + +#include "cut-glib-compatible.h" + +#if GLIB_CHECK_VERSION(2, 32, 0) +GMutex * +cut_glib_compatible_mutex_new(void) +{ + GMutex *mutex; + mutex = g_new(GMutex, 1); + g_mutex_init(mutex); + return mutex; +} + +void +cut_glib_compatible_mutex_free(GMutex *mutex) +{ + g_mutex_clear(mutex); + g_free(mutex); +} +#endif + +/* +vi:ts=4:nowrap:ai:expandtab:sw=4 +*/ Added: cutter/cut-glib-compatible.h (+47 -0) 100644 =================================================================== --- /dev/null +++ cutter/cut-glib-compatible.h 2013-07-13 22:49:00 +0900 (9617fdb) @@ -0,0 +1,47 @@ +/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Copyright (C) 2013 Kouhei Sutou <ko...@cl...> + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#ifndef __CUT_GLIB_COMPATIBLE_H__ +#define __CUT_GLIB_COMPATIBLE_H__ + +#include <glib.h> + +G_BEGIN_DECLS + +#if !GLIB_CHECK_VERSION(2, 32, 0) +# define GPrivate GStaticPrivate +# define G_PRIVATE_INIT(notify) G_STATIC_PRIVATE_INIT +# define g_private_get(key) g_static_private_get(key) +# define g_private_set(key, value) g_static_private_set(key, value, NULL) +#else +# define g_mutex_new() cut_glib_compatible_mutex_new() +# define g_mutex_free(mutex) cut_glib_compatible_mutex_free(mutex) + +GMutex *cut_glib_compatible_mutex_new (void); +void cut_glib_compatible_mutex_free(GMutex *mutex); + +#endif + +G_END_DECLS + +#endif /* __CUT_GLIB_COMPATIBLE_H__ */ + +/* +vi:ts=4:nowrap:ai:expandtab:sw=4 +*/ Modified: cutter/cut-test-context.c (+1 -25) =================================================================== --- cutter/cut-test-context.c 2013-06-26 10:19:49 +0900 (51e2c1c) +++ cutter/cut-test-context.c 2013-07-13 22:49:00 +0900 (3da898a) @@ -53,31 +53,7 @@ #include "cut-process.h" #include "cut-backtrace-entry.h" #include "cut-utils.h" - -#if !GLIB_CHECK_VERSION(2, 32, 0) -# define GPrivate GStaticPrivate -# define G_PRIVATE_INIT(notify) G_STATIC_PRIVATE_INIT -# define g_private_get(key) g_static_private_get(key) -# define g_private_set(key, value) g_static_private_set(key, value, NULL) -#else -# define g_mutex_new() mutex_new() -# define g_mutex_free(mutex) mutex_free(mutex) -static GMutex * -mutex_new(void) -{ - GMutex *mutex; - mutex = g_new(GMutex, 1); - g_mutex_init(mutex); - return mutex; -} - -static void -mutex_free(GMutex *mutex) -{ - g_mutex_clear(mutex); - g_free(mutex); -} -#endif +#include "cut-glib-compatible.h" #define CUT_SIGNAL_EXPLICIT_JUMP G_MININT |
|
From: HAYASHI K. <nul...@cl...> - 2013-06-26 01:20:20
|
HAYASHI Kentaro 2013-06-26 10:19:49 +0900 (Wed, 26 Jun 2013) New Revision: 74c485f6bb8345739f1de2e76b93929002f98b3c https://github.com/clear-code/cutter/commit/74c485f6bb8345739f1de2e76b93929002f98b3c Message: misc: follow the rule of release tag The release should be "1". See "The release Tag" section http://www.rpm.org/max-rpm/s1-rpm-inside-tags.html Modified files: misc/update-latest-release.rb Modified: misc/update-latest-release.rb (+1 -1) =================================================================== --- misc/update-latest-release.rb 2013-06-14 09:50:29 +0900 (c3387c4) +++ misc/update-latest-release.rb 2013-06-26 10:19:49 +0900 (83066b8) @@ -35,7 +35,7 @@ files.each do |file| if content !~ /#{Regexp.escape(new_version)}/ replaced_content = content.sub(/^(%changelog\n)/, <<-EOC) %changelog -* #{date} #{name} <#{email}> - #{new_version}-0 +* #{date} #{name} <#{email}> - #{new_version}-1 - new upstream release. EOC |
|
From: Kenji O. <nul...@cl...> - 2013-06-14 00:51:03
|
Kenji Okimoto 2013-06-14 09:50:29 +0900 (Fri, 14 Jun 2013) New Revision: 9f7fa4c830022651c2d892e7d4a45223b18dbef7 https://github.com/clear-code/cutter/commit/9f7fa4c830022651c2d892e7d4a45223b18dbef7 Message: misc: Set Encoding.default_external = UTF-8 to work on Ruby1.9 Modified files: misc/rd2refentry-lib.rb Modified: misc/rd2refentry-lib.rb (+4 -0) =================================================================== --- misc/rd2refentry-lib.rb 2013-05-27 10:53:14 +0900 (d2d0400) +++ misc/rd2refentry-lib.rb 2013-06-14 09:50:29 +0900 (1fffc5c) @@ -17,6 +17,10 @@ require 'rd-visitor-util' require "rubygems" require "fast_gettext/po_file" +if Object.const_defined?(:Encoding) + Encoding.default_external = Encoding::UTF_8 +end + module RD class RD2RefEntryVisitor < RDVisitor include ERB::Util |
|
From: Kouhei S. <nul...@cl...> - 2013-05-27 01:53:42
|
Kouhei Sutou 2013-05-27 10:53:14 +0900 (Mon, 27 May 2013) New Revision: dd56ec322a4ab3c11c0ae08c5ff336edad432e6f https://github.com/clear-code/cutter/commit/dd56ec322a4ab3c11c0ae08c5ff336edad432e6f Message: Indent Modified files: m4macros/cutter.m4 Modified: m4macros/cutter.m4 (+15 -15) =================================================================== --- m4macros/cutter.m4 2013-05-27 10:52:19 +0900 (79da330) +++ m4macros/cutter.m4 2013-05-27 10:53:14 +0900 (947ba57) @@ -114,9 +114,9 @@ AC_DEFUN([AC_CHECK_CUTTER], cutter_use_cutter=no else m4_ifdef([PKG_CHECK_MODULES], [ - PKG_CHECK_MODULES(CUTTER, cutter $1, - [cutter_use_cutter=yes], - [cutter_use_cutter=no]) + PKG_CHECK_MODULES(CUTTER, cutter $1, + [cutter_use_cutter=yes], + [cutter_use_cutter=no]) ], [cutter_use_cutter=no]) fi @@ -139,9 +139,9 @@ AC_DEFUN([AC_CHECK_GCUTTER], fi if test "x$cutter_use_gcutter" = "x"; then m4_ifdef([PKG_CHECK_MODULES], [ - PKG_CHECK_MODULES(GCUTTER, gcutter $1, - [cutter_use_gcutter=yes], - [cutter_use_gcutter=no]) + PKG_CHECK_MODULES(GCUTTER, gcutter $1, + [cutter_use_gcutter=yes], + [cutter_use_gcutter=no]) ], [cutter_use_gcutter=no]) fi @@ -158,9 +158,9 @@ AC_DEFUN([AC_CHECK_CPPCUTTER], fi if test "x$cutter_use_cppcutter" = "x"; then m4_ifdef([PKG_CHECK_MODULES], [ - PKG_CHECK_MODULES(CPPCUTTER, cppcutter $1, - [cutter_use_cppcutter=yes], - [cutter_use_cppcutter=no]) + PKG_CHECK_MODULES(CPPCUTTER, cppcutter $1, + [cutter_use_cppcutter=yes], + [cutter_use_cppcutter=no]) ], [cutter_use_cppcutter=no]) fi @@ -177,9 +177,9 @@ AC_DEFUN([AC_CHECK_GDKCUTTER_PIXBUF], fi if test "x$cutter_use_gdkcutter_pixbuf" = "x"; then m4_ifdef([PKG_CHECK_MODULES], [ - PKG_CHECK_MODULES(GDKCUTTER_PIXBUF, gdkcutter-pixbuf $1, - [cutter_use_gdkcutter_pixbuf=yes], - [cutter_use_gdkcutter_pixbuf=no]) + PKG_CHECK_MODULES(GDKCUTTER_PIXBUF, gdkcutter-pixbuf $1, + [cutter_use_gdkcutter_pixbuf=yes], + [cutter_use_gdkcutter_pixbuf=no]) ], [cutter_use_gdkcutter_pixbuf=no]) fi @@ -196,9 +196,9 @@ AC_DEFUN([AC_CHECK_SOUPCUTTER], fi if test "$cutter_use_soupcutter" != "no"; then m4_ifdef([PKG_CHECK_MODULES], [ - PKG_CHECK_MODULES(SOUPCUTTER, soupcutter $1, - [cutter_use_soupcutter=yes], - [cutter_use_soupcutter=no]) + PKG_CHECK_MODULES(SOUPCUTTER, soupcutter $1, + [cutter_use_soupcutter=yes], + [cutter_use_soupcutter=no]) ], [cutter_use_soupcutter=no]) fi |
|
From: Kouhei S. <nul...@cl...> - 2013-05-27 01:52:49
|
Kouhei Sutou 2013-05-27 10:52:19 +0900 (Mon, 27 May 2013) New Revision: 8d3dc5c6f8c13f386d1ec7aa0e6157464af7bfa4 https://github.com/clear-code/cutter/commit/8d3dc5c6f8c13f386d1ec7aa0e6157464af7bfa4 Message: Don't require PKG_CHECK_MODULES Modified files: m4macros/cutter.m4 Modified: m4macros/cutter.m4 (+15 -0) =================================================================== --- m4macros/cutter.m4 2013-05-18 00:41:38 +0900 (0b95808) +++ m4macros/cutter.m4 2013-05-27 10:52:19 +0900 (79da330) @@ -113,9 +113,12 @@ AC_DEFUN([AC_CHECK_CUTTER], if test "x$cutter_with_value" = "xno"; then cutter_use_cutter=no else + m4_ifdef([PKG_CHECK_MODULES], [ PKG_CHECK_MODULES(CUTTER, cutter $1, [cutter_use_cutter=yes], [cutter_use_cutter=no]) + ], + [cutter_use_cutter=no]) fi fi if test "$cutter_use_cutter" != "no"; then @@ -135,9 +138,12 @@ AC_DEFUN([AC_CHECK_GCUTTER], cutter_use_gcutter=no fi if test "x$cutter_use_gcutter" = "x"; then + m4_ifdef([PKG_CHECK_MODULES], [ PKG_CHECK_MODULES(GCUTTER, gcutter $1, [cutter_use_gcutter=yes], [cutter_use_gcutter=no]) + ], + [cutter_use_gcutter=no]) fi ac_cv_use_gcutter="$cutter_use_gcutter" # for backward compatibility AC_SUBST([GCUTTER_CFLAGS]) @@ -151,9 +157,12 @@ AC_DEFUN([AC_CHECK_CPPCUTTER], cutter_use_cppcutter=no fi if test "x$cutter_use_cppcutter" = "x"; then + m4_ifdef([PKG_CHECK_MODULES], [ PKG_CHECK_MODULES(CPPCUTTER, cppcutter $1, [cutter_use_cppcutter=yes], [cutter_use_cppcutter=no]) + ], + [cutter_use_cppcutter=no]) fi ac_cv_use_cppcutter="$cutter_use_cppcutter" # for backward compatibility AC_SUBST([CPPCUTTER_CFLAGS]) @@ -167,9 +176,12 @@ AC_DEFUN([AC_CHECK_GDKCUTTER_PIXBUF], cutter_use_gdkcutter_pixbuf=no fi if test "x$cutter_use_gdkcutter_pixbuf" = "x"; then + m4_ifdef([PKG_CHECK_MODULES], [ PKG_CHECK_MODULES(GDKCUTTER_PIXBUF, gdkcutter-pixbuf $1, [cutter_use_gdkcutter_pixbuf=yes], [cutter_use_gdkcutter_pixbuf=no]) + ], + [cutter_use_gdkcutter_pixbuf=no]) fi ac_cv_use_gdkcutter_pixbuf="$cutter_use_gdkcutter_pixbuf" # for backward compatibility AC_SUBST([GDKCUTTER_PIXBUF_CFLAGS]) @@ -183,9 +195,12 @@ AC_DEFUN([AC_CHECK_SOUPCUTTER], cutter_use_soupcutter=no fi if test "$cutter_use_soupcutter" != "no"; then + m4_ifdef([PKG_CHECK_MODULES], [ PKG_CHECK_MODULES(SOUPCUTTER, soupcutter $1, [cutter_use_soupcutter=yes], [cutter_use_soupcutter=no]) + ], + [cutter_use_soupcutter=no]) fi ac_cv_use_soupcutter="$cutter_use_soupcutter" # for backward compatibility AC_SUBST([SOUPCUTTER_CFLAGS]) |
|
From: Kouhei S. <nul...@cl...> - 2013-05-17 15:42:15
|
Kouhei Sutou 2013-05-18 00:41:38 +0900 (Sat, 18 May 2013) New Revision: f2d70bcd90b384bd9f3e4e915851e32ab9755087 https://github.com/clear-code/cutter/commit/f2d70bcd90b384bd9f3e4e915851e32ab9755087 Message: Add g_thread_supported() defined check Modified files: cutter/cut-main.c Modified: cutter/cut-main.c (+3 -1) =================================================================== --- cutter/cut-main.c 2013-05-18 00:36:26 +0900 (8fa568b) +++ cutter/cut-main.c 2013-05-18 00:41:38 +0900 (c4e0a5a) @@ -57,7 +57,9 @@ char **environ = NULL; #endif #if GLIB_CHECK_VERSION(2, 32, 0) -# define g_thread_supported() TRUE +# ifndef g_thread_supported +# define g_thread_supported() TRUE +# endif # define g_thread_init(vtable) #endif |
|
From: Kouhei S. <nul...@cl...> - 2013-05-17 15:36:49
|
Kouhei Sutou 2013-05-18 00:36:26 +0900 (Sat, 18 May 2013) New Revision: 212120c3324a6760e2fd71b09f7fc04a10475913 https://github.com/clear-code/cutter/commit/212120c3324a6760e2fd71b09f7fc04a10475913 Message: g_type_init() is deprecated since GLib 2.36 Modified files: cutter/cut-main.c Modified: cutter/cut-main.c (+4 -1) =================================================================== --- cutter/cut-main.c 2013-05-17 22:04:04 +0900 (92f09c9) +++ cutter/cut-main.c 2013-05-18 00:36:26 +0900 (8fa568b) @@ -52,8 +52,11 @@ char **environ = NULL; # include <winsock2.h> #endif -#if GLIB_CHECK_VERSION(2, 32, 0) +#if GLIB_CHECK_VERSION(2, 36, 0) # define g_type_init() +#endif + +#if GLIB_CHECK_VERSION(2, 32, 0) # define g_thread_supported() TRUE # define g_thread_init(vtable) #endif |
|
From: Kouhei S. <nul...@cl...> - 2013-05-17 13:04:29
|
Kouhei Sutou 2013-05-17 22:04:04 +0900 (Fri, 17 May 2013) New Revision: 223f15f048a6aca9d33715b4629383234833c4d8 https://github.com/clear-code/cutter/commit/223f15f048a6aca9d33715b4629383234833c4d8 Message: Disable GStreamer support Because GStreamer 0.10.x doesn't work with GLib >= 2.32. We should support it again! (Or drop it?) Modified files: configure.ac Modified: configure.ac (+3 -3) =================================================================== --- configure.ac 2013-05-17 21:58:56 +0900 (fee13cb) +++ configure.ac 2013-05-17 22:04:04 +0900 (04ddadf) @@ -414,13 +414,13 @@ AC_ARG_ENABLE([gstreamer], AS_HELP_STRING([--disable-gstreamer], [Disable GStreamer support]), [enable_gstreamer=$enableval], - [enable_gstreamer=yes]) + [enable_gstreamer=no]) dnl TODO: enable me again against GStreamer 1.0.0 or later AC_MSG_RESULT([$enable_gstreamer]) gstreamer_exists=no if test "x$enable_gstreamer" = "xyes"; then PKG_CHECK_MODULES(GSTREAMER, - gstreamer-0.10 >= 0.10.0 gstreamer-base-0.10 >= 0.10.0, + gstreamer-1.0 >= 1.0.0 gstreamer-base-1.0 >= 1.0.0, [gstreamer_exists=yes], [gstreamer_exists=no]) AC_SUBST([GSTREAMER_CFLAGS]) AC_SUBST([GSTREAMER_LIBS]) @@ -434,7 +434,7 @@ if test "x$enable_gstreamer" = "xyes"; then [gst_pluginsdir="$withval"], [gst_pluginsdir="auto"]) if test "$gst_pluginsdir" = "auto"; then - gst_pluginsdir=`pkg-config --variable=pluginsdir gstreamer-0.10` + gst_pluginsdir=`pkg-config --variable=pluginsdir gstreamer-1.0` fi AC_MSG_RESULT([$gst_pluginsdir]) AC_SUBST(gst_pluginsdir) |
|
From: Kouhei S. <nul...@cl...> - 2013-05-17 12:59:36
|
Kouhei Sutou 2013-05-17 21:58:56 +0900 (Fri, 17 May 2013) New Revision: f220bcbad459b08ce2b75fc73173877904cfd489 https://github.com/clear-code/cutter/commit/f220bcbad459b08ce2b75fc73173877904cfd489 Message: Remove thread test samples Because we can't maintain it. Removed files: sample/glib/thread-test.c sample/glib/thread.c Modified files: sample/glib/Makefile.am Modified: sample/glib/Makefile.am (+0 -3) =================================================================== --- sample/glib/Makefile.am 2013-05-17 21:57:29 +0900 (e1392fa) +++ sample/glib/Makefile.am 2013-05-17 21:58:56 +0900 (c8a9f6b) @@ -20,7 +20,6 @@ noinst_LTLIBRARIES = \ test_base64.la \ test_iochannel.la \ test_keyfile.la \ - test_thread.la \ test_utf8_pointer.la \ test_utf8_validate.la \ test_uri.la @@ -45,8 +44,6 @@ test_base64_la_SOURCES = base64.c test_iochannel_la_SOURCES = iochannel.c test_keyfile_la_SOURCES = keyfile.c test_regex_la_SOURCES = regex.c -test_thread_la_SOURCES = thread.c -test_thread_la_CFLAGS = $(AM_CFLAGS) $(NO_STRICT_ALIASING_CFLAGS) test_uri_la_SOURCES = uri.c test_utf8_pointer_la_SOURCES = utf8-pointer.c test_utf8_validate_la_SOURCES = utf8-validate.c Deleted: sample/glib/thread-test.c (+0 -162) 100644 =================================================================== --- sample/glib/thread-test.c 2013-05-17 21:57:29 +0900 (c13d51d) +++ /dev/null @@ -1,162 +0,0 @@ -#undef G_DISABLE_ASSERT -#undef G_LOG_DOMAIN - -#include <glib.h> - -/* GStaticPrivate */ - -#define THREADS 10 - -static GStaticMutex test_g_static_private_mutex = G_STATIC_MUTEX_INIT; -static guint test_g_static_private_counter = 0; -static guint test_g_static_private_ready = 0; - -static gpointer -test_g_static_private_constructor (void) -{ - g_static_mutex_lock (&test_g_static_private_mutex); - test_g_static_private_counter++; - g_static_mutex_unlock (&test_g_static_private_mutex); - return g_new (guint,1); -} - -static void -test_g_static_private_destructor (gpointer data) -{ - g_static_mutex_lock (&test_g_static_private_mutex); - test_g_static_private_counter--; - g_static_mutex_unlock (&test_g_static_private_mutex); - g_free (data); -} - - -static gpointer -test_g_static_private_thread (gpointer data) -{ -GStaticPrivate test_g_static_private_private1 = G_STATIC_PRIVATE_INIT; -GStaticPrivate test_g_static_private_private2 = G_STATIC_PRIVATE_INIT; - guint number = GPOINTER_TO_INT (data); - guint i; - guint *private1, *private2; - for (i = 0; i < 10; i++) - { - number = number * 11 + 1; /* A very simple and bad RNG ;-) */ - private1 = g_static_private_get (&test_g_static_private_private1); - if (!private1 || number % 7 > 3) - { - private1 = test_g_static_private_constructor (); - g_static_private_set (&test_g_static_private_private1, private1, - test_g_static_private_destructor); - } - *private1 = number; - private2 = g_static_private_get (&test_g_static_private_private2); - if (!private2 || number % 13 > 5) - { - private2 = test_g_static_private_constructor (); - g_static_private_set (&test_g_static_private_private2, private2, - test_g_static_private_destructor); - } - *private2 = number * 2; - g_usleep (G_USEC_PER_SEC / 5); - g_assert (number == *private1); - g_assert (number * 2 == *private2); - } - g_static_mutex_lock (&test_g_static_private_mutex); - test_g_static_private_ready++; - g_static_mutex_unlock (&test_g_static_private_mutex); - - /* Busy wait is not nice but that's just a test */ - while (test_g_static_private_ready != 0) - g_usleep (G_USEC_PER_SEC / 5); - - /* Reuse the static private */ - g_static_private_free (&test_g_static_private_private2); - g_static_private_init (&test_g_static_private_private2); - - for (i = 0; i < 10; i++) - { - private2 = g_static_private_get (&test_g_static_private_private2); - number = number * 11 + 1; /* A very simple and bad RNG ;-) */ - if (!private2 || number % 13 > 5) - { - private2 = test_g_static_private_constructor (); - g_static_private_set (&test_g_static_private_private2, private2, - test_g_static_private_destructor); - } - *private2 = number * 2; - g_usleep (G_USEC_PER_SEC / 5); - g_assert (number * 2 == *private2); - } - - return GINT_TO_POINTER (GPOINTER_TO_INT (data) * 3); -} - -static void -test_g_static_private (void) -{ - GThread *threads[THREADS]; - guint i; - - test_g_static_private_ready = 0; - - for (i = 0; i < THREADS; i++) - { - threads[i] = g_thread_create (test_g_static_private_thread, - GINT_TO_POINTER (i), TRUE, NULL); - } - - /* Busy wait is not nice but that's just a test */ - while (test_g_static_private_ready != THREADS) - g_usleep (G_USEC_PER_SEC / 5); - - test_g_static_private_ready = 0; - - for (i = 0; i < THREADS; i++) - g_assert (GPOINTER_TO_INT (g_thread_join (threads[i])) == i * 3); - - g_assert (test_g_static_private_counter == 0); -} - -static gpointer -test (gpointer data) -{ - test_g_static_private (); - return data; -} - -static gpointer -hoge (gpointer data) -{ - return data; -} - -int -main (int argc, - char *argv[]) -{ - GError *error = NULL; - GList *threads = NULL, *node; - int i; - GThread *t; - - g_thread_init (NULL); - - for (i = 0; i < 100; i++) - { - GThread *thread; - thread = g_thread_create(hoge, NULL, TRUE, &error); - threads = g_list_append(threads, thread); - } - - t = g_thread_create(test, NULL, TRUE, NULL); - threads = g_list_append(threads, t); - - for (node = threads; node; node = g_list_next(node)) - { - GThread *thread = node->data; - - g_thread_join(thread); - } - - return 0; -} Deleted: sample/glib/thread.c (+0 -416) 100644 =================================================================== --- sample/glib/thread.c 2013-05-17 21:57:29 +0900 (79aa962) +++ /dev/null @@ -1,416 +0,0 @@ -#include <cutter.h> - -#include <glib.h> - -#if defined(G_THREADS_ENABLED) && ! defined(G_THREADS_IMPL_NONE) -void test_g_mutex (void); -void test_g_static_rec_mutex (void); -void test_g_static_private (void); -void test_g_static_rw_lock (void); -void test_g_thread_once (void); - -void -setup (void) -{ - g_thread_use_default_impl = FALSE; -} - -typedef struct _TestData -{ - gint number; - guint unsigned_number; - CutTestContext *test_context; -} TestData; - -/* GMutex */ -static GMutex* test_g_mutex_mutex = NULL; -static guint test_g_mutex_int = 0; -static gboolean test_g_mutex_thread_ready; -G_LOCK_DEFINE_STATIC (test_g_mutex); - -static gpointer -test_g_mutex_thread (gpointer user_data) -{ - TestData *data = user_data; - - cut_set_current_test_context (data->test_context); - cut_assert_equal_int (42, data->number); - cut_assert_false (g_mutex_trylock (test_g_mutex_mutex)); - cut_assert_false (G_TRYLOCK (test_g_mutex)); - test_g_mutex_thread_ready = TRUE; - g_mutex_lock (test_g_mutex_mutex); - cut_assert_equal_int (42, test_g_mutex_int); - g_mutex_unlock (test_g_mutex_mutex); - - return GINT_TO_POINTER (41); -} - -void -test_g_mutex (void) -{ - GThread *thread; - TestData test_data; - test_g_mutex_mutex = g_mutex_new (); - - cut_assert_true (g_mutex_trylock (test_g_mutex_mutex)); - cut_assert_true (G_TRYLOCK (test_g_mutex)); - test_g_mutex_thread_ready = FALSE; - test_data.number = 42; - test_data.test_context = cut_get_current_test_context (); - thread = g_thread_create (test_g_mutex_thread, &test_data, TRUE, NULL); - /* This busy wait is only for testing purposes and not an example of - * good code!*/ - while (!test_g_mutex_thread_ready) - g_usleep (G_USEC_PER_SEC / 5); - test_g_mutex_int = 42; - G_UNLOCK (test_g_mutex); - g_mutex_unlock (test_g_mutex_mutex); - cut_assert_equal_int (41, GPOINTER_TO_INT (g_thread_join (thread))); - g_mutex_free (test_g_mutex_mutex); -} - -/* GStaticRecMutex */ - -static GStaticRecMutex test_g_static_rec_mutex_mutex = G_STATIC_REC_MUTEX_INIT; -static guint test_g_static_rec_mutex_int = 0; -static gboolean test_g_static_rec_mutex_thread_ready; - -static gpointer -test_g_static_rec_mutex_thread (gpointer user_data) -{ - TestData *data = user_data; - - cut_set_current_test_context (data->test_context); - - cut_assert_equal_int (42, data->number); - cut_assert_false (g_static_rec_mutex_trylock (&test_g_static_rec_mutex_mutex)); - test_g_static_rec_mutex_thread_ready = TRUE; - g_static_rec_mutex_lock (&test_g_static_rec_mutex_mutex); - g_static_rec_mutex_lock (&test_g_static_rec_mutex_mutex); - cut_assert_equal_int (42, test_g_static_rec_mutex_int); - test_g_static_rec_mutex_thread_ready = FALSE; - g_static_rec_mutex_unlock (&test_g_static_rec_mutex_mutex); - g_static_rec_mutex_unlock (&test_g_static_rec_mutex_mutex); - - g_thread_exit (GINT_TO_POINTER (43)); - - cut_fail("Never reached here"); - return NULL; -} - -void -test_g_static_rec_mutex (void) -{ - GThread *thread; - TestData test_data; - - cut_assert_true (g_static_rec_mutex_trylock (&test_g_static_rec_mutex_mutex)); - test_g_static_rec_mutex_thread_ready = FALSE; - test_data.number = 42; - test_data.test_context = cut_get_current_test_context (); - thread = g_thread_create (test_g_static_rec_mutex_thread, - &test_data, TRUE, NULL); - /* This busy wait is only for testing purposes and not an example of - * good code!*/ - while (!test_g_static_rec_mutex_thread_ready) - g_usleep (G_USEC_PER_SEC / 5); - - cut_assert_true (g_static_rec_mutex_trylock (&test_g_static_rec_mutex_mutex)); - test_g_static_rec_mutex_int = 41; - g_static_rec_mutex_unlock (&test_g_static_rec_mutex_mutex); - test_g_static_rec_mutex_int = 42; - g_static_rec_mutex_unlock (&test_g_static_rec_mutex_mutex); - - /* This busy wait is only for testing purposes and not an example of - * good code!*/ - while (test_g_static_rec_mutex_thread_ready) - g_usleep (G_USEC_PER_SEC / 5); - - g_static_rec_mutex_lock (&test_g_static_rec_mutex_mutex); - test_g_static_rec_mutex_int = 0; - g_static_rec_mutex_unlock (&test_g_static_rec_mutex_mutex); - - cut_assert_equal_int (43, GPOINTER_TO_INT (g_thread_join (thread))); -} - -/* GStaticPrivate */ - -#define THREADS 10 - -static GStaticPrivate test_g_static_private_private1 = G_STATIC_PRIVATE_INIT; -static GStaticPrivate test_g_static_private_private2 = G_STATIC_PRIVATE_INIT; -static GStaticMutex test_g_static_private_mutex = G_STATIC_MUTEX_INIT; -static guint test_g_static_private_counter = 0; -static guint test_g_static_private_ready = 0; - -static gpointer -test_g_static_private_constructor (void) -{ - g_static_mutex_lock (&test_g_static_private_mutex); - test_g_static_private_counter++; - g_static_mutex_unlock (&test_g_static_private_mutex); - return g_new (guint,1); -} - -static void -test_g_static_private_destructor (gpointer data) -{ - g_static_mutex_lock (&test_g_static_private_mutex); - test_g_static_private_counter--; - g_static_mutex_unlock (&test_g_static_private_mutex); - g_free (data); -} - - -static gpointer -test_g_static_private_thread (gpointer user_data) -{ - TestData *data = user_data; - guint number; - guint i; - guint *private1, *private2; - - cut_set_current_test_context (data->test_context); - number = data->unsigned_number; - - for (i = 0; i < 10; i++) - { - number = number * 11 + 1; /* A very simple and bad RNG ;-) */ - private1 = g_static_private_get (&test_g_static_private_private1); - if (!private1 || number % 7 > 3) - { - private1 = test_g_static_private_constructor (); - g_static_private_set (&test_g_static_private_private1, private1, - test_g_static_private_destructor); - } - *private1 = number; - private2 = g_static_private_get (&test_g_static_private_private2); - if (!private2 || number % 13 > 5) - { - private2 = test_g_static_private_constructor (); - g_static_private_set (&test_g_static_private_private2, private2, - test_g_static_private_destructor); - } - *private2 = number * 2; - g_usleep (G_USEC_PER_SEC / 5); - cut_assert_equal_int (number, *private1); - cut_assert_equal_int (number * 2, *private2); - } - g_static_mutex_lock (&test_g_static_private_mutex); - test_g_static_private_ready++; - g_static_mutex_unlock (&test_g_static_private_mutex); - - /* Busy wait is not nice but that's just a test */ - while (test_g_static_private_ready != 0) - g_usleep (G_USEC_PER_SEC / 5); - - for (i = 0; i < 10; i++) - { - private2 = g_static_private_get (&test_g_static_private_private2); - number = number * 11 + 1; /* A very simple and bad RNG ;-) */ - if (!private2 || number % 13 > 5) - { - private2 = test_g_static_private_constructor (); - g_static_private_set (&test_g_static_private_private2, private2, - test_g_static_private_destructor); - } - *private2 = number * 2; - g_usleep (G_USEC_PER_SEC / 5); - cut_assert_equal_int (number * 2, *private2); - } - - return GINT_TO_POINTER (data->unsigned_number * 3); -} - -void -test_g_static_private (void) -{ - GThread *threads[THREADS]; - TestData data[THREADS]; - guint i; - - test_g_static_private_ready = 0; - - for (i = 0; i < THREADS; i++) - { - data[i].unsigned_number = i; - data[i].test_context = cut_get_current_test_context (); - threads[i] = g_thread_create (test_g_static_private_thread, - &(data[i]), TRUE, NULL); - } - - /* Busy wait is not nice but that's just a test */ - while (test_g_static_private_ready != THREADS) - g_usleep (G_USEC_PER_SEC / 5); - - /* Reuse the static private */ - g_static_private_free (&test_g_static_private_private2); - g_static_private_init (&test_g_static_private_private2); - - test_g_static_private_ready = 0; - - for (i = 0; i < THREADS; i++) - cut_assert_equal_int (i * 3, GPOINTER_TO_INT (g_thread_join (threads[i]))); - - cut_assert_equal_int (0, test_g_static_private_counter); -} - -/* GStaticRWLock */ - -/* -1 = writing; >0 = # of readers */ -static gint test_g_static_rw_lock_state = 0; -G_LOCK_DEFINE (test_g_static_rw_lock_state); - -static gboolean test_g_static_rw_lock_run = TRUE; -static GStaticRWLock test_g_static_rw_lock_lock = G_STATIC_RW_LOCK_INIT; - -static gpointer -test_g_static_rw_lock_thread (gpointer data) -{ - cut_set_current_test_context (data); - while (test_g_static_rw_lock_run) - { - if (g_random_double() > .2) /* I'm a reader */ - { - - if (g_random_double() > .2) /* I'll block */ - g_static_rw_lock_reader_lock (&test_g_static_rw_lock_lock); - else /* I'll only try */ - if (!g_static_rw_lock_reader_trylock (&test_g_static_rw_lock_lock)) - continue; - G_LOCK (test_g_static_rw_lock_state); - cut_assert_operator_int (test_g_static_rw_lock_state, >=, 0); - test_g_static_rw_lock_state++; - G_UNLOCK (test_g_static_rw_lock_state); - - g_usleep (g_random_int_range (20,1000)); - - G_LOCK (test_g_static_rw_lock_state); - test_g_static_rw_lock_state--; - G_UNLOCK (test_g_static_rw_lock_state); - - g_static_rw_lock_reader_unlock (&test_g_static_rw_lock_lock); - } - else /* I'm a writer */ - { - - if (g_random_double() > .2) /* I'll block */ - g_static_rw_lock_writer_lock (&test_g_static_rw_lock_lock); - else /* I'll only try */ - if (!g_static_rw_lock_writer_trylock (&test_g_static_rw_lock_lock)) - continue; - G_LOCK (test_g_static_rw_lock_state); - cut_assert_equal_int (0, test_g_static_rw_lock_state); - test_g_static_rw_lock_state = -1; - G_UNLOCK (test_g_static_rw_lock_state); - - g_usleep (g_random_int_range (20,1000)); - - G_LOCK (test_g_static_rw_lock_state); - test_g_static_rw_lock_state = 0; - G_UNLOCK (test_g_static_rw_lock_state); - - g_static_rw_lock_writer_unlock (&test_g_static_rw_lock_lock); - } - } - return NULL; -} - -void -test_g_static_rw_lock (void) -{ - GThread *threads[THREADS]; - guint i; - for (i = 0; i < THREADS; i++) - { - threads[i] = g_thread_create (test_g_static_rw_lock_thread, - cut_get_current_test_context (), TRUE, NULL); - } - g_usleep (G_USEC_PER_SEC * 5); - test_g_static_rw_lock_run = FALSE; - for (i = 0; i < THREADS; i++) - { - g_thread_join (threads[i]); - } - cut_assert_equal_int (0, test_g_static_rw_lock_state); -} - -#define G_ONCE_SIZE 100 -#define G_ONCE_THREADS 10 - -G_LOCK_DEFINE (test_g_once); -static guint test_g_once_guint_array[G_ONCE_SIZE]; -static GOnce test_g_once_array[G_ONCE_SIZE]; - -static gpointer -test_g_once_init_func(gpointer arg) -{ - guint *count = arg; - g_usleep (g_random_int_range (20,1000)); - (*count)++; - g_usleep (g_random_int_range (20,1000)); - return arg; -} - -static gpointer -test_g_once_thread (gpointer user_data) -{ - TestData *data = user_data; - guint i; - - cut_set_current_test_context (data->test_context); - G_LOCK (test_g_once); - /* Don't start before all threads are created */ - G_UNLOCK (test_g_once); - for (i = 0; i < 1000; i++) - { - guint pos = g_random_int_range (0, G_ONCE_SIZE); - gpointer ret = g_once (test_g_once_array + pos, test_g_once_init_func, - test_g_once_guint_array + pos); - cut_assert_equal_pointer (ret, test_g_once_guint_array + pos); - } - - /* Make sure, that all counters are touched at least once */ - for (i = 0; i < G_ONCE_SIZE; i++) - { - gpointer ret = g_once (test_g_once_array + i, test_g_once_init_func, - test_g_once_guint_array + i); - cut_assert_equal_pointer (ret, test_g_once_guint_array + i); - } - - return NULL; -} - -void -test_g_thread_once (void) -{ - static GOnce once_init = G_ONCE_INIT; - GThread *threads[G_ONCE_THREADS]; - TestData data[G_ONCE_THREADS]; - guint i; - for (i = 0; i < G_ONCE_SIZE; i++) - { - test_g_once_array[i] = once_init; - test_g_once_guint_array[i] = i; - } - G_LOCK (test_g_once); - for (i = 0; i < G_ONCE_THREADS; i++) - { - data[i].unsigned_number = i % 2; - data[i].test_context = cut_get_current_test_context (); - threads[i] = g_thread_create (test_g_once_thread, &(data[i]), TRUE, NULL); - } - G_UNLOCK (test_g_once); - for (i = 0; i < G_ONCE_THREADS; i++) - { - g_thread_join (threads[i]); - } - - for (i = 0; i < G_ONCE_SIZE; i++) - { - cut_assert_equal_int (i + 1, test_g_once_guint_array[i]); - } -} - -#endif - |
|
From: Kouhei S. <nul...@cl...> - 2013-05-17 12:58:01
|
Kouhei Sutou 2013-05-17 21:57:29 +0900 (Fri, 17 May 2013) New Revision: 507a24ae0377a3fe9394dee80294f239c75a3196 https://github.com/clear-code/cutter/commit/507a24ae0377a3fe9394dee80294f239c75a3196 Message: Ignore deprecated initialize functions Because they were deprecated since GLib 2.32. Modified files: cutter/cut-main.c Modified: cutter/cut-main.c (+6 -0) =================================================================== --- cutter/cut-main.c 2013-05-17 21:55:05 +0900 (26d9b3a) +++ cutter/cut-main.c 2013-05-17 21:57:29 +0900 (92f09c9) @@ -52,6 +52,12 @@ char **environ = NULL; # include <winsock2.h> #endif +#if GLIB_CHECK_VERSION(2, 32, 0) +# define g_type_init() +# define g_thread_supported() TRUE +# define g_thread_init(vtable) +#endif + typedef enum { MODE_TEST, MODE_ANALYZE, |
|
From: Kouhei S. <nul...@cl...> - 2013-05-17 12:55:53
|
Kouhei Sutou 2013-05-17 21:45:38 +0900 (Fri, 17 May 2013) New Revision: 0c51e2294f577a0e4e8cb6d635b3fc025eb51bb4 https://github.com/clear-code/cutter/commit/0c51e2294f577a0e4e8cb6d635b3fc025eb51bb4 Message: Use GPrivate instead of GStaticPrivate Because GStaticPrivate was deprecated since GLib 2.32. Modified files: cutter/cut-test-context.c Modified: cutter/cut-test-context.c (+19 -15) =================================================================== --- cutter/cut-test-context.c 2013-04-16 13:29:55 +0900 (c3036d6) +++ cutter/cut-test-context.c 2013-05-17 21:45:38 +0900 (548522d) @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2007-2012 Kouhei Sutou <ko...@cl...> + * Copyright (C) 2007-2013 Kouhei Sutou <ko...@cl...> * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -54,6 +54,13 @@ #include "cut-backtrace-entry.h" #include "cut-utils.h" +#if !GLIB_CHECK_VERSION(2, 32, 0) +# define GPrivate GStaticPrivate +# define G_PRIVATE_INIT(notify) G_STATIC_PRIVATE_INIT +# define g_private_get(key) g_static_private_get(key) +# define g_private_set(key, value) g_static_private_set(key, value, NULL) +#endif + #define CUT_SIGNAL_EXPLICIT_JUMP G_MININT #define cut_omit(context, message) do \ @@ -174,7 +181,7 @@ taken_list_free (TakenList *taken_list) g_slice_free(TakenList, taken_list); } -static GStaticPrivate current_context_private; +static GPrivate current_context_private = G_PRIVATE_INIT(NULL); static void dispose (GObject *object); static void set_property (GObject *object, @@ -513,20 +520,17 @@ cut_test_context_error_quark (void) void cut_test_context_current_init (void) { - g_static_private_init(¤t_context_private); } void cut_test_context_current_quit (void) { - g_static_private_free(¤t_context_private); -} - -static void -contexts_free (gpointer data) -{ - GPtrArray *contexts = data; - g_ptr_array_free(contexts, TRUE); + GPtrArray *contexts; + contexts = g_private_get(¤t_context_private); + if (contexts) { + g_ptr_array_free(contexts, TRUE); + } + g_private_set(¤t_context_private, NULL); } void @@ -540,10 +544,10 @@ cut_test_context_current_push (CutTestContext *context) context = cut_test_context_new_sub(context); } - contexts = g_static_private_get(¤t_context_private); + contexts = g_private_get(¤t_context_private); if (!contexts) { contexts = g_ptr_array_new(); - g_static_private_set(¤t_context_private, contexts, contexts_free); + g_private_set(¤t_context_private, contexts); } g_ptr_array_add(contexts, context); } @@ -554,7 +558,7 @@ cut_test_context_current_pop (void) GPtrArray *contexts; CutTestContext *context = NULL; - contexts = g_static_private_get(¤t_context_private); + contexts = g_private_get(¤t_context_private); if (contexts) { context = g_ptr_array_index(contexts, contexts->len - 1); g_ptr_array_remove_index(contexts, contexts->len - 1); @@ -568,7 +572,7 @@ cut_test_context_current_peek (void) { GPtrArray *contexts; - contexts = g_static_private_get(¤t_context_private); + contexts = g_private_get(¤t_context_private); if (contexts) return g_ptr_array_index(contexts, contexts->len - 1); else |
|
From: Kouhei S. <nul...@cl...> - 2013-05-17 12:55:53
|
Kouhei Sutou 2013-05-17 21:55:05 +0900 (Fri, 17 May 2013) New Revision: 28b982e4d54fbe0b31bf42a68d65c43f975494a9 https://github.com/clear-code/cutter/commit/28b982e4d54fbe0b31bf42a68d65c43f975494a9 Message: Add backward compatible GMutex API Because dynamic GMutex allocation API was deprecated since GLib 2.32. GLib >= 2.32 provides g_mutex_new() and g_mutex_free() as deprecated API but they are not used because they showes deprecated messages at compile time. Modified files: cutter/cut-test-context.c Modified: cutter/cut-test-context.c (+18 -0) =================================================================== --- cutter/cut-test-context.c 2013-05-17 21:45:38 +0900 (548522d) +++ cutter/cut-test-context.c 2013-05-17 21:55:05 +0900 (51e2c1c) @@ -59,6 +59,24 @@ # define G_PRIVATE_INIT(notify) G_STATIC_PRIVATE_INIT # define g_private_get(key) g_static_private_get(key) # define g_private_set(key, value) g_static_private_set(key, value, NULL) +#else +# define g_mutex_new() mutex_new() +# define g_mutex_free(mutex) mutex_free(mutex) +static GMutex * +mutex_new(void) +{ + GMutex *mutex; + mutex = g_new(GMutex, 1); + g_mutex_init(mutex); + return mutex; +} + +static void +mutex_free(GMutex *mutex) +{ + g_mutex_clear(mutex); + g_free(mutex); +} #endif #define CUT_SIGNAL_EXPLICIT_JUMP G_MININT |
|
From: susumu.yata <nul...@cl...> - 2013-04-16 04:44:33
|
susumu.yata 2013-04-16 13:29:55 +0900 (Tue, 16 Apr 2013) New Revision: 173fb77b44161673e6fa141aa0603c8ff32fbe3d https://github.com/clear-code/cutter/commit/173fb77b44161673e6fa141aa0603c8ff32fbe3d Message: Add forward declaration of std::type_info gcc implicitly declares std::type_info, while clang does not. Modified files: cppcutter/cppcut-assertions-helper.h Modified: cppcutter/cppcut-assertions-helper.h (+5 -0) =================================================================== --- cppcutter/cppcut-assertions-helper.h 2013-04-13 15:28:50 +0900 (4549615) +++ cppcutter/cppcut-assertions-helper.h 2013-04-16 13:29:55 +0900 (8a63ada) @@ -25,6 +25,11 @@ #include <cutter/cut-helper.h> #include <cppcutter/cppcut-macros.h> +namespace std +{ + class type_info; +} + namespace cut { CPPCUT_DECL |
|
From: Kouhei S. <nul...@cl...> - 2013-04-13 06:29:30
|
Kouhei Sutou 2013-04-13 15:28:50 +0900 (Sat, 13 Apr 2013) New Revision: 9583bec97387942ab04306d52a079d17977ce407 https://github.com/clear-code/cutter/commit/9583bec97387942ab04306d52a079d17977ce407 Message: Revert "doc: follow sf.net download URL change" This reverts commit 2dfc9307fa517f6cc6995084d3da48d374fd3c01. Sorry. The URL is not changed! Modified files: doc/install-to-centos.rd doc/install-to-centos.rd.ja doc/install-to-cygwin.rd doc/install-to-cygwin.rd.ja doc/install-to-debian.rd doc/install-to-debian.rd.ja doc/install-to-fedora.rd doc/install-to-others.rd doc/install-to-others.rd.ja doc/install-to-solaris.rd doc/install-to-solaris.rd.ja doc/install-to-ubuntu.rd doc/install-to-ubuntu.rd.ja Modified: doc/install-to-centos.rd (+2 -2) =================================================================== --- doc/install-to-centos.rd 2013-04-13 15:24:54 +0900 (35d26f1) +++ doc/install-to-centos.rd 2013-04-13 15:28:50 +0900 (83dfc6a) @@ -15,13 +15,13 @@ Note that you must download RPM package on CentOS 5. CentOS 5: - % wget http://downloads.sourceforge.net/cutter/centos/cutter-release-1.1.0-0.noarch.rpm + % wget http://downloads.sourceforge.net/project/cutter/centos/cutter-release-1.1.0-0.noarch.rpm % rpm -Uvh cutter-release-1.1.0-0.noarch.rpm CentOS 6: - % sudo rpm -Uvh http://downloads.sourceforge.net/cutter/centos/cutter-release-1.1.0-0.noarch.rpm + % sudo rpm -Uvh http://downloads.sourceforge.net/project/cutter/centos/cutter-release-1.1.0-0.noarch.rpm Now, we can install Cutter by yum: Modified: doc/install-to-centos.rd.ja (+2 -2) =================================================================== --- doc/install-to-centos.rd.ja 2013-04-13 15:24:54 +0900 (08710c4) +++ doc/install-to-centos.rd.ja 2013-04-13 15:28:50 +0900 (8577948) @@ -16,12 +16,12 @@ CentOS 5では事前にRPMパッケージをダウンロードする必要があ CentOS 5: - % wget http://downloads.sourceforge.net/cutter/centos/cutter-release-1.1.0-0.noarch.rpm + % wget http://downloads.sourceforge.net/project/cutter/centos/cutter-release-1.1.0-0.noarch.rpm % sudo rpm -Uvh cutter-release-1.1.0-0.noarch.rpm CentOS 6: - % sudo rpm -Uvh http://downloads.sourceforge.net/cutter/centos/cutter-release-1.1.0-0.noarch.rpm + % sudo rpm -Uvh http://downloads.sourceforge.net/project/cutter/centos/cutter-release-1.1.0-0.noarch.rpm Yumリポジトリを登録したらyumでインストールできます。 Modified: doc/install-to-cygwin.rd (+1 -1) =================================================================== --- doc/install-to-cygwin.rd 2013-04-13 15:24:54 +0900 (a967ef7) +++ doc/install-to-cygwin.rd 2013-04-13 15:28:50 +0900 (e35565e) @@ -36,7 +36,7 @@ We enter into Cygwin. We run Cygwin. We install Cutter. % cd - % wget http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz + % wget http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz % tar xvzf cutter-1.2.2.tar.gz % cd cutter-1.2.2 % ./configure Modified: doc/install-to-cygwin.rd.ja (+1 -1) =================================================================== --- doc/install-to-cygwin.rd.ja 2013-04-13 15:24:54 +0900 (9706336) +++ doc/install-to-cygwin.rd.ja 2013-04-13 15:28:50 +0900 (fb29367) @@ -35,7 +35,7 @@ Cygwin 1.7を対象とします。 これで下準備は整ったのでCutterをインストールします。 % cd - % wget http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz + % wget http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz % tar xvzf cutter-1.2.2.tar.gz % cd cutter-1.2.2 % ./configure Modified: doc/install-to-debian.rd (+6 -6) =================================================================== --- doc/install-to-debian.rd 2013-04-13 15:24:54 +0900 (8fa224b) +++ doc/install-to-debian.rd 2013-04-13 15:28:50 +0900 (874b536) @@ -20,22 +20,22 @@ Here are apt lines for for squeeze. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/debian/ squeeze main - deb-src http://downloads.sourceforge.net/cutter/debian/ squeeze main + deb http://downloads.sourceforge.net/project/cutter/debian/ squeeze main + deb-src http://downloads.sourceforge.net/project/cutter/debian/ squeeze main Here are apt lines for for wheezy. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/debian/ wheezy main - deb-src http://downloads.sourceforge.net/cutter/debian/ wheezy main + deb http://downloads.sourceforge.net/project/cutter/debian/ wheezy main + deb-src http://downloads.sourceforge.net/project/cutter/debian/ wheezy main Here are apt lines for for sid. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/debian/ unstable main - deb-src http://downloads.sourceforge.net/cutter/debian/ unstable main + deb http://downloads.sourceforge.net/project/cutter/debian/ unstable main + deb-src http://downloads.sourceforge.net/project/cutter/debian/ unstable main Cutter packages are signed by key of cutter-keyring. Register the key by installing cutter-keyring package. Modified: doc/install-to-debian.rd.ja (+6 -6) =================================================================== --- doc/install-to-debian.rd.ja 2013-04-13 15:24:54 +0900 (b06cb20) +++ doc/install-to-debian.rd.ja 2013-04-13 15:28:50 +0900 (a2bde6f) @@ -21,22 +21,22 @@ squeezeの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/debian/ squeeze main - deb-src http://downloads.sourceforge.net/cutter/debian/ squeeze main + deb http://downloads.sourceforge.net/project/cutter/debian/ squeeze main + deb-src http://downloads.sourceforge.net/project/cutter/debian/ squeeze main wheezyの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/debian/ wheezy main - deb-src http://downloads.sourceforge.net/cutter/debian/ wheezy main + deb http://downloads.sourceforge.net/project/cutter/debian/ wheezy main + deb-src http://downloads.sourceforge.net/project/cutter/debian/ wheezy main sidの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/debian/ unstable main - deb-src http://downloads.sourceforge.net/cutter/debian/ unstable main + deb http://downloads.sourceforge.net/project/cutter/debian/ unstable main + deb-src http://downloads.sourceforge.net/project/cutter/debian/ unstable main Cutterパッケージはcutter-keyringが提供している鍵で署名されています。 cutter-keyringパッケージをインストールして鍵を登録してください。 Modified: doc/install-to-fedora.rd (+1 -1) =================================================================== --- doc/install-to-fedora.rd 2013-04-13 15:24:54 +0900 (bcec1ba) +++ doc/install-to-fedora.rd 2013-04-13 15:28:50 +0900 (787899f) @@ -12,7 +12,7 @@ We can use yum because Cutter provides a Yum repository. First, we need to register Cutter Yum repository: - % sudo rpm -Uvh http://downloads.sourceforge.net/cutter/fedora/cutter-release-1.1.0-0.noarch.rpm + % sudo rpm -Uvh http://downloads.sourceforge.net/project/cutter/fedora/cutter-release-1.1.0-0.noarch.rpm Now, we can install Cutter by yum: Modified: doc/install-to-others.rd (+2 -2) =================================================================== --- doc/install-to-others.rd 2013-04-13 15:24:54 +0900 (a19f1e5) +++ doc/install-to-others.rd 2013-04-13 15:28:50 +0900 (185f18f) @@ -36,7 +36,7 @@ Cutter uses GNU build tools: % mkdir -p ~/src % cd ~/src - % wget http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz + % wget http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz % tar xvzf cutter-1.2.2.tar.gz % cd cutter-1.2.2 % ./configure @@ -49,7 +49,7 @@ into ~/local/: % mkdir -p ~/src % cd ~/src - % wget http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz + % wget http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz % tar xvzf cutter-1.2.2.tar.gz % cd cutter-1.2.2 % ./configure PKG_CONFIG_PATH=$HOME/local/lib/pkgconfig LD_LIBRARY_PATH=$HOME/local/lib --prefix=$HOME/local Modified: doc/install-to-others.rd.ja (+2 -2) =================================================================== --- doc/install-to-others.rd.ja 2013-04-13 15:24:54 +0900 (bac3cb0) +++ doc/install-to-others.rd.ja 2013-04-13 15:28:50 +0900 (584c55a) @@ -35,7 +35,7 @@ CutterはGNUビルドツールを利用しているので、他のフリーソ % mkdir -p ~/src % cd ~/src - % wget http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz + % wget http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz % tar xvzf cutter-1.2.2.tar.gz % cd cutter-1.2.2 % ./configure @@ -48,7 +48,7 @@ CutterはGNUビルドツールを利用しているので、他のフリーソ % mkdir -p ~/src % cd ~/src - % wget http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz + % wget http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz % tar xvzf cutter-1.2.2.tar.gz % cd cutter-1.2.2 % ./configure PKG_CONFIG_PATH=$HOME/local/lib/pkgconfig LD_LIBRARY_PATH=$HOME/local/lib --prefix=$HOME/local Modified: doc/install-to-solaris.rd (+1 -1) =================================================================== --- doc/install-to-solaris.rd 2013-04-13 15:24:54 +0900 (da46aab) +++ doc/install-to-solaris.rd 2013-04-13 15:28:50 +0900 (3eaefb5) @@ -54,7 +54,7 @@ make: % mkdir -p ~/src % cd ~/src - % wget http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz + % wget http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz % tar xvzf cutter-1.2.2.tar.gz % cd cutter-1.2.2 % ./configure Modified: doc/install-to-solaris.rd.ja (+1 -1) =================================================================== --- doc/install-to-solaris.rd.ja 2013-04-13 15:24:54 +0900 (d745fc0) +++ doc/install-to-solaris.rd.ja 2013-04-13 15:28:50 +0900 (628aa3a) @@ -98,7 +98,7 @@ install-cutter.sh: gmake pfexec gmake install cd ~/src - wget -N http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz + wget -N http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz gtar xf cutter-1.2.2.tar.gz cd cutter-1.2.2 ./configure --prefix=$PREFIX Modified: doc/install-to-ubuntu.rd (+10 -10) =================================================================== --- doc/install-to-ubuntu.rd 2013-04-13 15:24:54 +0900 (8575b5d) +++ doc/install-to-ubuntu.rd 2013-04-13 15:28:50 +0900 (b2f2207) @@ -21,36 +21,36 @@ Here are apt lines for for Lucid. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/ubuntu/ lucid main - deb-src http://downloads.sourceforge.net/cutter/ubuntu/ lucid main + deb http://downloads.sourceforge.net/project/cutter/ubuntu/ lucid main + deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ lucid main Here are apt lines for for Natty. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/ubuntu/ natty main - deb-src http://downloads.sourceforge.net/cutter/ubuntu/ natty main + deb http://downloads.sourceforge.net/project/cutter/ubuntu/ natty main + deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ natty main Here are apt lines for for Oneiric. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/ubuntu/ oneiric main - deb-src http://downloads.sourceforge.net/cutter/ubuntu/ oneiric main + deb http://downloads.sourceforge.net/project/cutter/ubuntu/ oneiric main + deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ oneiric main Here are apt lines for for Precise. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/ubuntu/ precise main - deb-src http://downloads.sourceforge.net/cutter/ubuntu/ precise main + deb http://downloads.sourceforge.net/project/cutter/ubuntu/ precise main + deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ precise main Here are apt lines for for Quantal. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/ubuntu/ quantal main - deb-src http://downloads.sourceforge.net/cutter/ubuntu/ quantal main + deb http://downloads.sourceforge.net/project/cutter/ubuntu/ quantal main + deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ quantal main Cutter packages are signed by key of cutter-keyring. Register the key by installing cutter-keyring package. Modified: doc/install-to-ubuntu.rd.ja (+10 -10) =================================================================== --- doc/install-to-ubuntu.rd.ja 2013-04-13 15:24:54 +0900 (d7db7b2) +++ doc/install-to-ubuntu.rd.ja 2013-04-13 15:28:50 +0900 (a472a18) @@ -21,36 +21,36 @@ Lucidの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/ubuntu/ lucid main - deb-src http://downloads.sourceforge.net/cutter/ubuntu/ lucid main + deb http://downloads.sourceforge.net/project/cutter/ubuntu/ lucid main + deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ lucid main Nattyの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/ubuntu/ natty main - deb-src http://downloads.sourceforge.net/cutter/ubuntu/ natty main + deb http://downloads.sourceforge.net/project/cutter/ubuntu/ natty main + deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ natty main Oneiricの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/ubuntu/ oneiric main - deb-src http://downloads.sourceforge.net/cutter/ubuntu/ oneiric main + deb http://downloads.sourceforge.net/project/cutter/ubuntu/ oneiric main + deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ oneiric main Preciseの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/ubuntu/ precise main - deb-src http://downloads.sourceforge.net/cutter/ubuntu/ precise main + deb http://downloads.sourceforge.net/project/cutter/ubuntu/ precise main + deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ precise main Quantalの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/cutter/ubuntu/ quantal main - deb-src http://downloads.sourceforge.net/cutter/ubuntu/ quantal main + deb http://downloads.sourceforge.net/project/cutter/ubuntu/ quantal main + deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ quantal main Cutterパッケージはcutter-keyringが提供している鍵で署名されています。 cutter-keyringパッケージをインストールして鍵を登録してください。 |
|
From: Kouhei S. <nul...@cl...> - 2013-04-13 06:25:41
|
Kouhei Sutou 2013-04-13 15:24:54 +0900 (Sat, 13 Apr 2013) New Revision: 2dfc9307fa517f6cc6995084d3da48d374fd3c01 https://github.com/clear-code/cutter/commit/2dfc9307fa517f6cc6995084d3da48d374fd3c01 Message: doc: follow sf.net download URL change "/project" is removed. Modified files: doc/install-to-centos.rd doc/install-to-centos.rd.ja doc/install-to-cygwin.rd doc/install-to-cygwin.rd.ja doc/install-to-debian.rd doc/install-to-debian.rd.ja doc/install-to-fedora.rd doc/install-to-others.rd doc/install-to-others.rd.ja doc/install-to-solaris.rd doc/install-to-solaris.rd.ja doc/install-to-ubuntu.rd doc/install-to-ubuntu.rd.ja Modified: doc/install-to-centos.rd (+2 -2) =================================================================== --- doc/install-to-centos.rd 2013-02-19 21:13:43 +0900 (83dfc6a) +++ doc/install-to-centos.rd 2013-04-13 15:24:54 +0900 (35d26f1) @@ -15,13 +15,13 @@ Note that you must download RPM package on CentOS 5. CentOS 5: - % wget http://downloads.sourceforge.net/project/cutter/centos/cutter-release-1.1.0-0.noarch.rpm + % wget http://downloads.sourceforge.net/cutter/centos/cutter-release-1.1.0-0.noarch.rpm % rpm -Uvh cutter-release-1.1.0-0.noarch.rpm CentOS 6: - % sudo rpm -Uvh http://downloads.sourceforge.net/project/cutter/centos/cutter-release-1.1.0-0.noarch.rpm + % sudo rpm -Uvh http://downloads.sourceforge.net/cutter/centos/cutter-release-1.1.0-0.noarch.rpm Now, we can install Cutter by yum: Modified: doc/install-to-centos.rd.ja (+2 -2) =================================================================== --- doc/install-to-centos.rd.ja 2013-02-19 21:13:43 +0900 (8577948) +++ doc/install-to-centos.rd.ja 2013-04-13 15:24:54 +0900 (08710c4) @@ -16,12 +16,12 @@ CentOS 5では事前にRPMパッケージをダウンロードする必要があ CentOS 5: - % wget http://downloads.sourceforge.net/project/cutter/centos/cutter-release-1.1.0-0.noarch.rpm + % wget http://downloads.sourceforge.net/cutter/centos/cutter-release-1.1.0-0.noarch.rpm % sudo rpm -Uvh cutter-release-1.1.0-0.noarch.rpm CentOS 6: - % sudo rpm -Uvh http://downloads.sourceforge.net/project/cutter/centos/cutter-release-1.1.0-0.noarch.rpm + % sudo rpm -Uvh http://downloads.sourceforge.net/cutter/centos/cutter-release-1.1.0-0.noarch.rpm Yumリポジトリを登録したらyumでインストールできます。 Modified: doc/install-to-cygwin.rd (+1 -1) =================================================================== --- doc/install-to-cygwin.rd 2013-02-19 21:13:43 +0900 (e35565e) +++ doc/install-to-cygwin.rd 2013-04-13 15:24:54 +0900 (a967ef7) @@ -36,7 +36,7 @@ We enter into Cygwin. We run Cygwin. We install Cutter. % cd - % wget http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz + % wget http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz % tar xvzf cutter-1.2.2.tar.gz % cd cutter-1.2.2 % ./configure Modified: doc/install-to-cygwin.rd.ja (+1 -1) =================================================================== --- doc/install-to-cygwin.rd.ja 2013-02-19 21:13:43 +0900 (fb29367) +++ doc/install-to-cygwin.rd.ja 2013-04-13 15:24:54 +0900 (9706336) @@ -35,7 +35,7 @@ Cygwin 1.7を対象とします。 これで下準備は整ったのでCutterをインストールします。 % cd - % wget http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz + % wget http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz % tar xvzf cutter-1.2.2.tar.gz % cd cutter-1.2.2 % ./configure Modified: doc/install-to-debian.rd (+6 -6) =================================================================== --- doc/install-to-debian.rd 2013-02-19 21:13:43 +0900 (874b536) +++ doc/install-to-debian.rd 2013-04-13 15:24:54 +0900 (8fa224b) @@ -20,22 +20,22 @@ Here are apt lines for for squeeze. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/debian/ squeeze main - deb-src http://downloads.sourceforge.net/project/cutter/debian/ squeeze main + deb http://downloads.sourceforge.net/cutter/debian/ squeeze main + deb-src http://downloads.sourceforge.net/cutter/debian/ squeeze main Here are apt lines for for wheezy. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/debian/ wheezy main - deb-src http://downloads.sourceforge.net/project/cutter/debian/ wheezy main + deb http://downloads.sourceforge.net/cutter/debian/ wheezy main + deb-src http://downloads.sourceforge.net/cutter/debian/ wheezy main Here are apt lines for for sid. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/debian/ unstable main - deb-src http://downloads.sourceforge.net/project/cutter/debian/ unstable main + deb http://downloads.sourceforge.net/cutter/debian/ unstable main + deb-src http://downloads.sourceforge.net/cutter/debian/ unstable main Cutter packages are signed by key of cutter-keyring. Register the key by installing cutter-keyring package. Modified: doc/install-to-debian.rd.ja (+6 -6) =================================================================== --- doc/install-to-debian.rd.ja 2013-02-19 21:13:43 +0900 (a2bde6f) +++ doc/install-to-debian.rd.ja 2013-04-13 15:24:54 +0900 (b06cb20) @@ -21,22 +21,22 @@ squeezeの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/debian/ squeeze main - deb-src http://downloads.sourceforge.net/project/cutter/debian/ squeeze main + deb http://downloads.sourceforge.net/cutter/debian/ squeeze main + deb-src http://downloads.sourceforge.net/cutter/debian/ squeeze main wheezyの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/debian/ wheezy main - deb-src http://downloads.sourceforge.net/project/cutter/debian/ wheezy main + deb http://downloads.sourceforge.net/cutter/debian/ wheezy main + deb-src http://downloads.sourceforge.net/cutter/debian/ wheezy main sidの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/debian/ unstable main - deb-src http://downloads.sourceforge.net/project/cutter/debian/ unstable main + deb http://downloads.sourceforge.net/cutter/debian/ unstable main + deb-src http://downloads.sourceforge.net/cutter/debian/ unstable main Cutterパッケージはcutter-keyringが提供している鍵で署名されています。 cutter-keyringパッケージをインストールして鍵を登録してください。 Modified: doc/install-to-fedora.rd (+1 -1) =================================================================== --- doc/install-to-fedora.rd 2013-02-19 21:13:43 +0900 (787899f) +++ doc/install-to-fedora.rd 2013-04-13 15:24:54 +0900 (bcec1ba) @@ -12,7 +12,7 @@ We can use yum because Cutter provides a Yum repository. First, we need to register Cutter Yum repository: - % sudo rpm -Uvh http://downloads.sourceforge.net/project/cutter/fedora/cutter-release-1.1.0-0.noarch.rpm + % sudo rpm -Uvh http://downloads.sourceforge.net/cutter/fedora/cutter-release-1.1.0-0.noarch.rpm Now, we can install Cutter by yum: Modified: doc/install-to-others.rd (+2 -2) =================================================================== --- doc/install-to-others.rd 2013-02-19 21:13:43 +0900 (185f18f) +++ doc/install-to-others.rd 2013-04-13 15:24:54 +0900 (a19f1e5) @@ -36,7 +36,7 @@ Cutter uses GNU build tools: % mkdir -p ~/src % cd ~/src - % wget http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz + % wget http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz % tar xvzf cutter-1.2.2.tar.gz % cd cutter-1.2.2 % ./configure @@ -49,7 +49,7 @@ into ~/local/: % mkdir -p ~/src % cd ~/src - % wget http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz + % wget http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz % tar xvzf cutter-1.2.2.tar.gz % cd cutter-1.2.2 % ./configure PKG_CONFIG_PATH=$HOME/local/lib/pkgconfig LD_LIBRARY_PATH=$HOME/local/lib --prefix=$HOME/local Modified: doc/install-to-others.rd.ja (+2 -2) =================================================================== --- doc/install-to-others.rd.ja 2013-02-19 21:13:43 +0900 (584c55a) +++ doc/install-to-others.rd.ja 2013-04-13 15:24:54 +0900 (bac3cb0) @@ -35,7 +35,7 @@ CutterはGNUビルドツールを利用しているので、他のフリーソ % mkdir -p ~/src % cd ~/src - % wget http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz + % wget http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz % tar xvzf cutter-1.2.2.tar.gz % cd cutter-1.2.2 % ./configure @@ -48,7 +48,7 @@ CutterはGNUビルドツールを利用しているので、他のフリーソ % mkdir -p ~/src % cd ~/src - % wget http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz + % wget http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz % tar xvzf cutter-1.2.2.tar.gz % cd cutter-1.2.2 % ./configure PKG_CONFIG_PATH=$HOME/local/lib/pkgconfig LD_LIBRARY_PATH=$HOME/local/lib --prefix=$HOME/local Modified: doc/install-to-solaris.rd (+1 -1) =================================================================== --- doc/install-to-solaris.rd 2013-02-19 21:13:43 +0900 (3eaefb5) +++ doc/install-to-solaris.rd 2013-04-13 15:24:54 +0900 (da46aab) @@ -54,7 +54,7 @@ make: % mkdir -p ~/src % cd ~/src - % wget http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz + % wget http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz % tar xvzf cutter-1.2.2.tar.gz % cd cutter-1.2.2 % ./configure Modified: doc/install-to-solaris.rd.ja (+1 -1) =================================================================== --- doc/install-to-solaris.rd.ja 2013-02-19 21:13:43 +0900 (628aa3a) +++ doc/install-to-solaris.rd.ja 2013-04-13 15:24:54 +0900 (d745fc0) @@ -98,7 +98,7 @@ install-cutter.sh: gmake pfexec gmake install cd ~/src - wget -N http://downloads.sourceforge.net/project/cutter/cutter-1.2.2.tar.gz + wget -N http://downloads.sourceforge.net/cutter/cutter-1.2.2.tar.gz gtar xf cutter-1.2.2.tar.gz cd cutter-1.2.2 ./configure --prefix=$PREFIX Modified: doc/install-to-ubuntu.rd (+10 -10) =================================================================== --- doc/install-to-ubuntu.rd 2013-02-19 21:13:43 +0900 (b2f2207) +++ doc/install-to-ubuntu.rd 2013-04-13 15:24:54 +0900 (8575b5d) @@ -21,36 +21,36 @@ Here are apt lines for for Lucid. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/ubuntu/ lucid main - deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ lucid main + deb http://downloads.sourceforge.net/cutter/ubuntu/ lucid main + deb-src http://downloads.sourceforge.net/cutter/ubuntu/ lucid main Here are apt lines for for Natty. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/ubuntu/ natty main - deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ natty main + deb http://downloads.sourceforge.net/cutter/ubuntu/ natty main + deb-src http://downloads.sourceforge.net/cutter/ubuntu/ natty main Here are apt lines for for Oneiric. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/ubuntu/ oneiric main - deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ oneiric main + deb http://downloads.sourceforge.net/cutter/ubuntu/ oneiric main + deb-src http://downloads.sourceforge.net/cutter/ubuntu/ oneiric main Here are apt lines for for Precise. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/ubuntu/ precise main - deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ precise main + deb http://downloads.sourceforge.net/cutter/ubuntu/ precise main + deb-src http://downloads.sourceforge.net/cutter/ubuntu/ precise main Here are apt lines for for Quantal. We put them into /etc/apt/sources.list.d/cutter.list. /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/ubuntu/ quantal main - deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ quantal main + deb http://downloads.sourceforge.net/cutter/ubuntu/ quantal main + deb-src http://downloads.sourceforge.net/cutter/ubuntu/ quantal main Cutter packages are signed by key of cutter-keyring. Register the key by installing cutter-keyring package. Modified: doc/install-to-ubuntu.rd.ja (+10 -10) =================================================================== --- doc/install-to-ubuntu.rd.ja 2013-02-19 21:13:43 +0900 (a472a18) +++ doc/install-to-ubuntu.rd.ja 2013-04-13 15:24:54 +0900 (d7db7b2) @@ -21,36 +21,36 @@ Lucidの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/ubuntu/ lucid main - deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ lucid main + deb http://downloads.sourceforge.net/cutter/ubuntu/ lucid main + deb-src http://downloads.sourceforge.net/cutter/ubuntu/ lucid main Nattyの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/ubuntu/ natty main - deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ natty main + deb http://downloads.sourceforge.net/cutter/ubuntu/ natty main + deb-src http://downloads.sourceforge.net/cutter/ubuntu/ natty main Oneiricの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/ubuntu/ oneiric main - deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ oneiric main + deb http://downloads.sourceforge.net/cutter/ubuntu/ oneiric main + deb-src http://downloads.sourceforge.net/cutter/ubuntu/ oneiric main Preciseの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/ubuntu/ precise main - deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ precise main + deb http://downloads.sourceforge.net/cutter/ubuntu/ precise main + deb-src http://downloads.sourceforge.net/cutter/ubuntu/ precise main Quantalの場合は以下のapt lineを書いた /etc/apt/sources.list.d/cutter.listを作成してください。 /etc/apt/sources.list.d/cutter.list: - deb http://downloads.sourceforge.net/project/cutter/ubuntu/ quantal main - deb-src http://downloads.sourceforge.net/project/cutter/ubuntu/ quantal main + deb http://downloads.sourceforge.net/cutter/ubuntu/ quantal main + deb-src http://downloads.sourceforge.net/cutter/ubuntu/ quantal main Cutterパッケージはcutter-keyringが提供している鍵で署名されています。 cutter-keyringパッケージをインストールして鍵を登録してください。 |
|
From: Kouhei S. <nul...@cl...> - 2013-04-13 06:25:38
|
Kouhei Sutou 2013-02-19 21:13:43 +0900 (Tue, 19 Feb 2013) New Revision: 9da924ecc876f6705e21e297a346a34b27462daf https://github.com/clear-code/cutter/commit/9da924ecc876f6705e21e297a346a34b27462daf Message: doc: fix wrong signal name Modified files: gcutter/gcut-egg.h Modified: gcutter/gcut-egg.h (+1 -1) =================================================================== --- gcutter/gcut-egg.h 2013-02-06 00:09:31 +0900 (89f48a1) +++ gcutter/gcut-egg.h 2013-02-19 21:13:43 +0900 (bb81216) @@ -85,7 +85,7 @@ G_BEGIN_DECLS * GError *error = NULL; * * egg = gcut_egg_new("echo", "XXX", NULL); - * g_signal_connect(egg, "receive-output", + * g_signal_connect(egg, "output-received", * G_CALLBACK(cb_output_received), NULL); * * gcut_egg_hatch(egg, &error); |
|
From: HAYASHI K. <nul...@cl...> - 2013-02-05 15:10:25
|
HAYASHI Kentaro 2013-02-06 00:09:31 +0900 (Wed, 06 Feb 2013) New Revision: 239558777505209c1e5cb0189cac96ad8c4a4f3f https://github.com/clear-code/cutter/commit/239558777505209c1e5cb0189cac96ad8c4a4f3f Log: rpm fedora: fix bogus date issues Modified files: packages/rpm/fedora/cutter.spec.in Modified: packages/rpm/fedora/cutter.spec.in (+4 -4) =================================================================== --- packages/rpm/fedora/cutter.spec.in 2013-02-05 12:47:42 +0900 (1ddd3cd) +++ packages/rpm/fedora/cutter.spec.in 2013-02-06 00:09:31 +0900 (43e8514) @@ -147,7 +147,7 @@ make check LD_LIBRARY_PATH=$(pwd)/cppcutter/.libs:$(pwd)/cutter/.libs:$(pwd)/gdk %{_libdir}/gstreamer-0.10/libgstcuttertest.so %changelog -* Tue Jan 30 2013 HAYASHI Kentaro <ha...@cl...> - 1.2.2-4 +* Wed Jan 30 2013 HAYASHI Kentaro <ha...@cl...> - 1.2.2-4 - remove needless %%defattr. - remove needless Requires:. - aggregate redundant %%dir ownership to cutter base package. @@ -214,15 +214,15 @@ make check LD_LIBRARY_PATH=$(pwd)/cppcutter/.libs:$(pwd)/cutter/.libs:$(pwd)/gdk - (1.1.2-0) - new upstream release -* Thu Mar 3 2010 Kouhei Sutou <ko...@cl...> +* Wed Mar 3 2010 Kouhei Sutou <ko...@cl...> - (1.1.1-0) - new upstream release -* Thu Nov 3 2009 Kouhei Sutou <ko...@cl...> +* Tue Nov 3 2009 Kouhei Sutou <ko...@cl...> - (1.1.0-0) - new upstream release -* Mon Oct 20 2009 Kouhei Sutou <ko...@cl...> +* Tue Oct 20 2009 Kouhei Sutou <ko...@cl...> - (1.0.9-0) - new upstream release |
|
From: Kouhei S. <nul...@cl...> - 2013-02-05 03:48:02
|
Kouhei Sutou 2013-02-05 12:47:42 +0900 (Tue, 05 Feb 2013) New Revision: ebc5902e020517efd0467b97c2c02161c904495d https://github.com/clear-code/cutter/commit/ebc5902e020517efd0467b97c2c02161c904495d Log: Merge pull request #4 from kz0817/master Support of cppcut_assert_equal(const type_info &, const type_info &) Patch by Kazuhiro Yamato. Thanks!!! |
|
From: Kazuhiro Y. <nul...@cl...> - 2013-02-05 03:48:02
|
Kazuhiro Yamato 2013-02-05 12:24:21 +0900 (Tue, 05 Feb 2013) New Revision: d162f1f3159befb02025ddcf92061fe90c184ea5 https://github.com/clear-code/cutter/commit/d162f1f3159befb02025ddcf92061fe90c184ea5 Merged ebc5902: Merge pull request #4 from kz0817/master Log: supported cppcut_assert_equal(const type_info &, const type_info &). The previous version fails to build a test with the above expression, because the class: type_info doesn't have an operator<<() for getting the object content. This patch gets it with type_info.name() in the newly-added specilized template function. Modified files: cppcutter/cppcut-assertions-helper.cpp cppcutter/cppcut-assertions-helper.h test/cppcutter/test-cppcut-assertions.cpp Modified: cppcutter/cppcut-assertions-helper.cpp (+22 -0) =================================================================== --- cppcutter/cppcut-assertions-helper.cpp 2013-01-30 23:09:04 +0900 (62de6f0) +++ cppcutter/cppcut-assertions-helper.cpp 2013-02-05 12:24:21 +0900 (47aac02) @@ -17,6 +17,7 @@ * */ +#include <typeinfo> #include "cppcut-assertions-helper.h" CPPCUT_DECL void @@ -60,6 +61,27 @@ cut::assert_equal(const char *expected, const char *actual, expression_expected, expression_actual); } +template <> +CPPCUT_DECL void +cut::assert_equal_reference<std::type_info>(const std::type_info& expected, + const std::type_info& actual, + const char *expression_expected, + const char *expression_actual) +{ + if (expected == actual) { + cut_test_pass(); + } else { + std::ostringstream message; + + cut_set_expected(expected.name()); + cut_set_actual(actual.name()); + + message << "<" << expression_expected << " == "; + message << expression_actual << ">"; + cut_test_fail(message.str().c_str()); + } +} + CPPCUT_DECL void cut::assert_not_equal(char *expected, char *actual, const char *expression_expected, Modified: cppcutter/cppcut-assertions-helper.h (+4 -0) =================================================================== --- cppcutter/cppcut-assertions-helper.h 2013-01-30 23:09:04 +0900 (ad09c7c) +++ cppcutter/cppcut-assertions-helper.h 2013-02-05 12:24:21 +0900 (4549615) @@ -77,6 +77,10 @@ namespace cut } } + template <> void assert_equal_reference<std::type_info>( + const std::type_info& expected, const std::type_info& actual, + const char *expression_expected, const char *expression_actual); + template <class Type> void assert_equal(const Type *expected, const Type *actual, const char *expression_expected, Modified: test/cppcutter/test-cppcut-assertions.cpp (+27 -0) =================================================================== --- test/cppcutter/test-cppcut-assertions.cpp 2013-01-30 23:09:04 +0900 (db295b6) +++ test/cppcutter/test-cppcut-assertions.cpp 2013-02-05 12:24:21 +0900 (d13bb49) @@ -17,6 +17,7 @@ * */ +#include <typeinfo> #include <cppcutter.h> #include <cutter/cut-test.h> #include <cutter/cut-test-result.h> @@ -434,6 +435,32 @@ namespace cppcut_assertion_equal "void cppcut_assertion_equal::stub_string()", NULL); } + + static void + stub_type_info (void) + { + cppcut_assert_equal(typeid(int), typeid(1)); + MARK_FAIL(cppcut_assert_equal(typeid(int), typeid(1.0))); + } + + void + test_type_info (void) + { + test = cut_test_new("equal_type_info test", stub_type_info); + cut_assert_not_null(test); + + cut_assert_false(run()); + cut_assert_test_result_summary(run_context, 1, 1, 0, 1, 0, 0, 0, 0); + cut_assert_test_result(run_context, 0, CUT_TEST_RESULT_FAILURE, + "equal_type_info test", + NULL, + "<typeid(int) == typeid(1.0)>", + cut_take_printf("%s", typeid(int).name()), + cut_take_printf("%s", typeid(double).name()), + FAIL_LOCATION, + "void cppcut_assertion_equal::stub_type_info()", + NULL); + } } namespace cppcut_assertion_not_equal |
