Changeset 684

Timestamp:

2005年08月24日 10時49分42秒 (3 years ago)

Author:

fujii

Message:

* Makefile.am (AM_CXXFLAGS): Warning options is modified
tentatively.

* Makefile.in (AM_CXXFLAGS): Ditto.

* res.rc (IDC_ROOT_DESKTOP): Widened.
(IDC_ROOT_DESKTOP): Ditto.

* io_stream_cygfile.cc (io_stream_cygfile::write): A Workaround.
Forces to flush a file after writing.

* desktop.cc (get_ImageMagick_installer_path): New Function.
(install_ImageMagick): Detect a path of ImageMagick? installer by
installation information.
(do_desktop_setup): Call both of install_ImageMagick() and
install_Meadow() properly.

Files:

• branches/3.00/src/ChangeLog.Meadow (modified) (1 diff)
• branches/3.00/src/Makefile.am (modified) (1 diff)
• branches/3.00/src/Makefile.in (modified) (1 diff)
• branches/3.00/src/desktop.cc (modified) (2 diffs)
• branches/3.00/src/io_stream_cygfile.cc (modified) (1 diff)
• branches/3.00/src/libgetopt++/ChangeLog.Meadow (added)
• branches/3.00/src/libgetopt++/Makefile.am (modified) (1 diff)
• branches/3.00/src/libgetopt++/Makefile.in (modified) (1 diff)
• branches/3.00/src/res.rc (modified) (1 diff)

branches/3.00/src/ChangeLog.Meadow

@@ +1 @@
+2005-08-24  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
+
+        * Makefile.am (AM_CXXFLAGS): Warning options is modified
+        tentatively.
+
+        * Makefile.in (AM_CXXFLAGS): Ditto.
+
+        * res.rc (IDC_ROOT_DESKTOP): Widened.
+        (IDC_ROOT_DESKTOP): Ditto.
+
+        * io_stream_cygfile.cc (io_stream_cygfile::write): A Workaround.
+        Forces to flush a file after writing.
+
+        * desktop.cc (get_ImageMagick_installer_path): New Function.
+        (install_ImageMagick): Detect a path of ImageMagick installer by
+        installation information.
+        (do_desktop_setup): Call both of install_ImageMagick() and
+        install_Meadow() properly.
+
-2005-07-15  KOSEKI Yoshinori  <kose@meadowy.org>
-

branches/3.00/src/Makefile.am

@@ -28 +28 @@
-# this warning. (Bug verified present in gcc-3.3)
-BASECXXFLAGS    = -Wall -Wpointer-arith -Wcomments -Wcast-align -Wwrite-strings
-
+
+
-AM_CFLAGS       = $(AM_CXXFLAGS) -Wmissing-declarations -Winline \
-                  -Wstrict-prototypes -Wmissing-prototypes

branches/3.00/src/Makefile.in

@@ -290 +290 @@
-# this warning. (Bug verified present in gcc-3.3)
-BASECXXFLAGS = -Wall -Wpointer-arith -Wcomments -Wcast-align -Wwrite-strings
-
+
+
-AM_CFLAGS = $(AM_CXXFLAGS) -Wmissing-declarations -Winline \
-                  -Wstrict-prototypes -Wmissing-prototypes

branches/3.00/src/desktop.cc

@@ -222 +222 @@
-}
-
+static String
+get_ImageMagick_installer_path ()
+{
+  packagedb db;
+  PackageSpecification spec ("imagemagick");
+  packagemeta *required = db.findBinary (spec);
+
+  /*
+   * check appropriate ImageMagick package is installed.
+   */
+  if (!required)
+    return "";
+
+  if (!(spec.satisfies (required->installed)
+        && required->desired == required->installed))
+    return "";
+
+  String file_name = required->installed.getfirstfile ();
+
+  /*
+   * find a file which name ends with ".exe".
+   */
+  while (int length = file_name.size ())
+    {
+      // 4 is length of ".exe".
+      if (length > 4
+          && strnicmp (file_name.cstr () + (length - 4), ".exe", 4) == 0)
+        return file_name;
+    }
+
+  return "";
+}
+
-static void
-install_ImageMagick ()
-{
-
-
+
+
+
+
+
+
+
+
-}
-#endif
@@ -236 +275 @@
-  if (root_menu)
-    {
+      install_ImageMagick ();
+    }
+
+  if (root_desktop)
+    {
-      install_Meadow ();
-    }
-
-  if (root_desktop)
-    {
-      install_ImageMagick ();
-    }
-#else

branches/3.00/src/io_stream_cygfile.cc

@@ -255 +255 @@
-{
-  if (fp)
+#if MEADOW_NETINSTALL
+    {
+      /*
+       * Workaround: Some instances of io_stream is not destructed
+       * because of memory leak. Therefore, some of small files are
+       * not flushed to disk until process of setup is finished.
+       */
+      ssize_t ret = fwrite (buffer, 1, len, fp);
+      fflush (fp);
+      return ret;
+    }
+#else
-    return fwrite (buffer, 1, len, fp);
+#endif
-  return 0;
-}

branches/3.00/src/libgetopt++/Makefile.am

@@ -5 +5 @@
-
-AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
-
+
+
-##DIST_SUBDIRS  = src
-##SUBDIRS               = src

branches/3.00/src/libgetopt++/Makefile.in

@@ -223 +223 @@
-target_alias = @target_alias@
-AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
-
+
+
-DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
-INCLUDES = -I$(top_srcdir)/include

branches/3.00/src/res.rc

@@ -272 +272 @@
-BEGIN
-    CONTROL         "Execute install.exe",IDC_ROOT_DESKTOP,"Button",
-0
+2
-    CONTROL         "Execute ImageMagick's setup.",IDC_ROOT_MENU,"Button",
-0
+2
-    ICON            IDI_CYGWIN,IDC_HEADICON,290,0,21,20
-    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,