• R/O
  • HTTP
  • SSH
  • HTTPS

wtklite: コミット

A light-weight C++ object model framework Windows API Tool Kit


コミットメタ情報

リビジョン7913ba431dca89b99fb51e0823d2c0f6ef4b1f70 (tree)
日時2012-10-12 05:43:09
作者Keith Marshall <keithmarshall@user...>
コミッターKeith Marshall

ログメッセージ

Change package name from wtk/wtkplus to wtklite.

--HG--
rename : wtkplus.h => wtklite.h

変更サマリ

差分

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
1+2012-09-11 Keith Marshall <keithmarshall@users.sourceforge.net>
2+
3+ Change package name from wtk/wtkplus to wtklite.
4+
5+ * configure.ac (AC_INIT): Set package name field to wtklite.
6+
7+ * wtkplus.h: Rename file as...
8+ * wtklite.h: ...this.
9+
10+ * Makefile.in: Change corresponding generated library name...
11+ (libwtkplus.a): ...from this...
12+ (libwtklite.a): ...to this.
13+
14+ * all files: Update references accordingly.
15+
116 2012-09-05 Keith Marshall <keithmarshall@users.sourceforge.net>
217
318 Licence wording enhancements.
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,7 @@ OBJEXT = @OBJEXT@
5656 AR = @AR@
5757 ARFLAGS = @ARFLAGS@
5858
59-all: libwtkplus.a
59+all: libwtklite.a
6060
6161 # Default target is a statically linkable object library, comprising
6262 # the following object modules.
@@ -65,7 +65,7 @@ LIBWTK_OBJECTS = wtkbase.$(OBJEXT) wtkmain.$(OBJEXT) wndproc.$(OBJEXT) \
6565 dlgproc.$(OBJEXT) wtkchild.$(OBJEXT) wtkexcept.$(OBJEXT) errtext.$(OBJEXT) \
6666 sashctrl.$(OBJEXT) hsashctl.$(OBJEXT) vsashctl.$(OBJEXT) strres.$(OBJEXT)
6767
68-libwtkplus.a: $(LIBWTK_OBJECTS)
68+libwtklite.a: $(LIBWTK_OBJECTS)
6969 $(AR) $(ARFLAGS) $@ $^
7070
7171 # Compilation and dependency tracking...
@@ -103,17 +103,17 @@ install: install-dirs install-headers install-libs
103103 install-dirs:
104104 $(MKDIR_P) ${includedir} ${libdir}
105105
106-install-headers: wtkplus.h wtkexcept.h
106+install-headers: wtklite.h wtkexcept.h
107107 $(INSTALL_DATA) $^ ${includedir}
108108
109-install-libs: libwtkplus.a
109+install-libs: libwtklite.a
110110 $(INSTALL_DATA) $^ ${libdir}
111111
112112 # Distribution rules.
113113 #
114114 TARNAME = $(PACKAGE)-$(VERSION)-mingw32
115115 SRCDIST_FILES = ChangeLog configure configure.ac Makefile.in install-sh \
116- wtkplus.h wtkexcept.h wtkbase.cpp wtkmain.cpp wtkchild.cpp wndproc.cpp \
116+ wtklite.h wtkexcept.h wtkbase.cpp wtkmain.cpp wtkchild.cpp wndproc.cpp \
117117 dlgproc.cpp sashctrl.cpp wtkexcept.cpp errtext.cpp strres.cpp
118118
119119 dist: srcdist devdist
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
11 # configure.ac
22 #
3- AC_INIT([wtk],[0.1.0],[http://mingw.org/Reporting_Bugs])
3+ AC_INIT([wtklite],[0.1.0],[http://mingw.org/Reporting_Bugs])
44 #
55 # Implementation of a minimal C++ class framework for use with the
66 # Microsoft Windows Application Programming Interface.
--- a/dlgproc.cpp
+++ b/dlgproc.cpp
@@ -40,7 +40,7 @@
4040 */
4141 #define WIN32_LEAN_AND_MEAN
4242
43-#include "wtkplus.h"
43+#include "wtklite.h"
4444
4545 namespace WTK
4646 {
--- a/sashctrl.cpp
+++ b/sashctrl.cpp
@@ -49,7 +49,7 @@
4949 */
5050 #define WIN32_LEAN_AND_MEAN
5151
52-#include "wtkplus.h"
52+#include "wtklite.h"
5353
5454 /* Identify the class implementation to be compiled; each of
5555 * the HSASH_IMPLEMENTATION and VSASH_IMPLEMENTATION must be
--- a/strres.cpp
+++ b/strres.cpp
@@ -40,7 +40,7 @@
4040 */
4141 #define WIN32_LEAN_AND_MEAN
4242
43-#include "wtkplus.h"
43+#include "wtklite.h"
4444 #include <string.h>
4545 #include <stdio.h>
4646
--- a/wndproc.cpp
+++ b/wndproc.cpp
@@ -40,7 +40,7 @@
4040 */
4141 #define WIN32_LEAN_AND_MEAN
4242
43-#include "wtkplus.h"
43+#include "wtklite.h"
4444
4545 namespace WTK
4646 {
--- a/wtkbase.cpp
+++ b/wtkbase.cpp
@@ -40,7 +40,7 @@
4040 */
4141 #define WIN32_LEAN_AND_MEAN
4242
43-#include "wtkplus.h"
43+#include "wtklite.h"
4444
4545 namespace WTK
4646 {
--- a/wtkchild.cpp
+++ b/wtkchild.cpp
@@ -41,7 +41,7 @@
4141 #define WIN32_LEAN_AND_MEAN
4242
4343 #include <stdio.h>
44-#include "wtkplus.h"
44+#include "wtklite.h"
4545
4646 namespace WTK
4747 {
--- a/wtkexcept.h
+++ b/wtkexcept.h
@@ -10,7 +10,7 @@
1010 * $Id$
1111 *
1212 * This header file declares the exception class WTK::runtime_error.
13- * It is implicitly included when including wtkplus.h, but may also be
13+ * It is implicitly included when including wtklite.h, but may also be
1414 * explicitly included by any application which wishes to use the WTK
1515 * exception class, without the rest of the WTK C++ class framework.
1616 *
@@ -46,6 +46,13 @@
4646 */
4747 #define WTKEXCEPT_H 1
4848
49+/* This header file is primarily intended to be used only for C++. However,
50+ * configure scripts may try to compile it as C, when checking availability;
51+ * thus, we ignore C++ specific content when compiling as C, to ensure that
52+ * configure doesn't choke in such cases.
53+ */
54+#ifdef __cplusplus
55+
4956 #include <exception>
5057
5158 namespace WTK
@@ -81,4 +88,5 @@ namespace WTK
8188 };
8289 }
8390
91+#endif /* __cplusplus */
8492 #endif /* ! WTKEXCEPT_H: $RCSfile$: end of file */
--- a/wtkplus.h
+++ b/wtklite.h
@@ -1,6 +1,6 @@
1-#ifndef WTKPLUS_H
1+#ifndef WTKLITE_H
22 /*
3- * wtkplus.h
3+ * wtklite.h
44 *
55 * ---------------------------------------------------------------------------
66 *
@@ -39,12 +39,19 @@
3939 * ---------------------------------------------------------------------------
4040 *
4141 */
42-#define WTKPLUS_H 1
42+#define WTKLITE_H 1
4343
4444 #include <stdlib.h>
4545 #include <windows.h>
4646 #include "wtkexcept.h"
4747
48+/* This header file is primarily intended to be used only for C++. However,
49+ * configure scripts may try to compile it as C, when checking availability;
50+ * thus, we ignore C++ specific content when compiling as C, to ensure that
51+ * configure doesn't choke in such cases.
52+ */
53+#ifdef __cplusplus
54+
4855 namespace WTK
4956 {
5057 class StringResource
@@ -297,4 +304,5 @@ namespace WTK
297304 };
298305 }
299306
300-#endif /* ! WTKPLUS_H: $RCSfile$: end of file */
307+#endif /* __cplusplus */
308+#endif /* ! WTKLITE_H: $RCSfile$: end of file */
--- a/wtkmain.cpp
+++ b/wtkmain.cpp
@@ -40,7 +40,7 @@
4040 */
4141 #define WIN32_LEAN_AND_MEAN
4242
43-#include "wtkplus.h"
43+#include "wtklite.h"
4444
4545 namespace WTK
4646 {
旧リポジトリブラウザで表示