Overview
Comment: | Updated to not randomly have libconfig.h passed through the C preprocessor |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
269106f456b0822932219541d61223e0 |
User & Date: | rkeene on 2014-11-24 18:11:57 |
Other Links: | manifest | tags |
Context
2014-11-24
| ||
18:21 | Updated to use individual m4 files from upstream repo, and many other cleanups check-in: 5e72879d0d user: rkeene tags: trunk | |
18:11 | Updated to not randomly have libconfig.h passed through the C preprocessor check-in: 269106f456 user: rkeene tags: trunk | |
18:02 | Updated list of authors check-in: 683cf7201d user: rkeene tags: trunk | |
Changes
Modified .fossil-settings/ignore-glob from [e97ace63c4] to [168a13de83].
36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
libconfig.a/* libconfig.dll libconfig.dll.a libconfig.dll.a/* libconfig.dll.def libconfig.dll.def/* libconfig.dll/* libconfig.h libconfig.h/* libconfig.so libconfig.so/* test-lc test-lc.exe test-lc.exe/* test-lc/* test.cfg test.cfg/* |
< < |
36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 |
libconfig.a/* libconfig.dll libconfig.dll.a libconfig.dll.a/* libconfig.dll.def libconfig.dll.def/* libconfig.dll/* libconfig.so libconfig.so/* test-lc test-lc.exe test-lc.exe/* test-lc/* test.cfg test.cfg/* |
Modified Makefile.in from [65d0a00b06] to [8809f1c079].
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
..
83
84
85
86
87
88
89
|
%_shr.o: $(srcdir)/%.c $(CC) $(CPPFLAGS) $(CFLAGS) $(SHOBJFLAGS) -c -o $@ "$(filter %.c, $^)" %.o: $(srcdir)/%.c $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ "$(filter %.c, $^)" libconfig.h: $(srcdir)/libconfig.h.in cat "$^" | $(CPP) $(CPPFLAGS) - | grep -v '^#' | grep -v '^ *$$' | sed 's/^!/# /g;s/__BLANK_LINE__//' > $@ test-lc$(EXEEXT): $(LIBS) $(srcdir)/test-lc.c $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(filter %.c, $^) $(LDFLAGS) -Wl,-R -Wl,. -L. -lconfig .PHONY: clean distclean install clean: rm -f *.o $(BINS) $(LIBS) libconfig.h *~ test-lc$(EXEEXT) *.dll.a *.dll.def *.dll distclean: clean rm -f Makefile config.h config.status config.log lc_geterrno.3 lc_process.3 lc_cleanup.3 lc_process_file.3 lc_register_var.3 lc_geterrstr.3 lc_register_callback.3 libconfig.3 install: all libconfig.h -$(INSTALL) -d "$(mandir)" -$(INSTALL) -d "$(mandir)/man3" ................................................................................ $(INSTALL) -m 644 lc_geterrno.3 "$(mandir)/man3/lc_geterrno.3" $(INSTALL) -m 644 lc_process.3 "$(mandir)/man3/lc_process.3" $(INSTALL) -m 644 lc_cleanup.3 "$(mandir)/man3/lc_cleanup.3" $(INSTALL) -m 644 libconfig.3 "$(mandir)/man3/libconfig.3" $(INSTALL) -m 644 libconfig.h "$(includedir)/libconfig.h" -( cd "$(libdir)" && rm -f libconfig.$(SHOBJEXT).$(PKGVERSMAJOR) && $(LN_S) libconfig.$(SHOBJEXT).$(PKGVERS) libconfig.$(SHOBJEXT).$(PKGVERSMAJOR) ) -( cd "$(libdir)" && rm -f libconfig.$(SHOBJEXT) && $(LN_S) libconfig.$(SHOBJEXT).$(PKGVERS) libconfig.$(SHOBJEXT) ) |
<
<
<
<
|
>
>
|
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
..
79
80
81
82
83
84
85
86
87
|
%_shr.o: $(srcdir)/%.c $(CC) $(CPPFLAGS) $(CFLAGS) $(SHOBJFLAGS) -c -o $@ "$(filter %.c, $^)" %.o: $(srcdir)/%.c $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ "$(filter %.c, $^)" test-lc$(EXEEXT): $(LIBS) $(srcdir)/test-lc.c $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(filter %.c, $^) $(LDFLAGS) -Wl,-R -Wl,. -L. -lconfig clean: rm -f *.o $(BINS) $(LIBS) *~ test-lc$(EXEEXT) *.dll.a *.dll.def *.dll distclean: clean rm -f Makefile config.h config.status config.log lc_geterrno.3 lc_process.3 lc_cleanup.3 lc_process_file.3 lc_register_var.3 lc_geterrstr.3 lc_register_callback.3 libconfig.3 install: all libconfig.h -$(INSTALL) -d "$(mandir)" -$(INSTALL) -d "$(mandir)/man3" ................................................................................ $(INSTALL) -m 644 lc_geterrno.3 "$(mandir)/man3/lc_geterrno.3" $(INSTALL) -m 644 lc_process.3 "$(mandir)/man3/lc_process.3" $(INSTALL) -m 644 lc_cleanup.3 "$(mandir)/man3/lc_cleanup.3" $(INSTALL) -m 644 libconfig.3 "$(mandir)/man3/libconfig.3" $(INSTALL) -m 644 libconfig.h "$(includedir)/libconfig.h" -( cd "$(libdir)" && rm -f libconfig.$(SHOBJEXT).$(PKGVERSMAJOR) && $(LN_S) libconfig.$(SHOBJEXT).$(PKGVERS) libconfig.$(SHOBJEXT).$(PKGVERSMAJOR) ) -( cd "$(libdir)" && rm -f libconfig.$(SHOBJEXT) && $(LN_S) libconfig.$(SHOBJEXT).$(PKGVERS) libconfig.$(SHOBJEXT) ) .PHONY: all clean distclean install |
Deleted build/h-to-hin version [34a6b6eb8a].
1 2 3 4 5 6 7 8 9 |
#! /bin/sh if [ libconfig.h -nt libconfig.h.in ]; then echo 'Updating libconfig.h.in ...' sed 's@^# @!@;s@^ *$@:__BLANK_LINE__:@' libconfig.h | tr ':' "\n" > libconfig.h.in else echo 'Updating libconfig.h ...' make libconfig.h fi |
< < < < < < < < < |
Added libconfig.h version [7c61a9805e].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 |
#ifndef _RSK_LIBCONFIG_H # define _RSK_LIBCONFIG_H # ifdef __cplusplus extern "C" { # endif typedef enum { LC_CONF_SECTION, LC_CONF_APACHE, LC_CONF_COLON, LC_CONF_EQUAL, LC_CONF_SPACE, LC_CONF_XML } lc_conf_type_t; typedef enum { LC_VAR_UNKNOWN, LC_VAR_NONE, LC_VAR_STRING, LC_VAR_LONG_LONG, LC_VAR_LONG, LC_VAR_INT, LC_VAR_SHORT, LC_VAR_BOOL, LC_VAR_FILENAME, LC_VAR_DIRECTORY, LC_VAR_SIZE_LONG_LONG, LC_VAR_SIZE_LONG, LC_VAR_SIZE_INT, LC_VAR_SIZE_SHORT, LC_VAR_TIME, LC_VAR_DATE, LC_VAR_SECTION, LC_VAR_SECTIONSTART, LC_VAR_SECTIONEND, LC_VAR_BOOL_BY_EXISTANCE, LC_VAR_SIZE_SIZE_T, LC_VAR_CIDR, LC_VAR_IP, LC_VAR_IP4, LC_VAR_IP6, LC_VAR_ADDR, LC_VAR_ADDR4, LC_VAR_ADDR6, LC_VAR_HOSTNAME, LC_VAR_HOSTNAME4, LC_VAR_HOSTNAME6, LC_VAR_DOUBLE, LC_VAR_FLOAT, LC_VAR_LIST = 0x80 } lc_var_type_t; typedef enum { LC_FLAGS_VAR, LC_FLAGS_CMDLINE, LC_FLAGS_ENVIRON, LC_FLAGS_SECTIONSTART, LC_FLAGS_SECTIONEND } lc_flags_t; typedef enum { LC_ERR_NONE, LC_ERR_INVCMD, LC_ERR_INVSECTION, LC_ERR_INVDATA, LC_ERR_BADFORMAT, LC_ERR_CANTOPEN, LC_ERR_CALLBACK, LC_ERR_ENOMEM } lc_err_t; int lc_process(int argc, char **argv, const char *appname, lc_conf_type_t type, const char *extra); int lc_register_callback(const char *var, char opt, lc_var_type_t type, int (*callback)(const char *, const char *, const char *, const char *, lc_flags_t, void *), void *extra); int lc_register_var(const char *var, lc_var_type_t type, void *data, char opt); lc_err_t lc_geterrno(void); void lc_seterrstr(const char *usererrstr); char *lc_geterrstr(void); int lc_process_file(const char *appname, const char *pathname, lc_conf_type_t type); int lc_handle_type(lc_var_type_t type, const char *value, void *data); void lc_cleanup(void); # define LC_CBRET_IGNORESECTION (255) # define LC_CBRET_OKAY (0) # define LC_CBRET_ERROR (-1) extern int lc_optind; # ifdef __cplusplus } # endif #endif |
Deleted libconfig.h.in version [7b32045b6a].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 |
!ifndef _RSK_LIBCONFIG_H !define _RSK_LIBCONFIG_H !ifdef __cplusplus extern "C" { !endif __BLANK_LINE__ typedef enum { LC_CONF_SECTION, LC_CONF_APACHE, LC_CONF_COLON, LC_CONF_EQUAL, LC_CONF_SPACE, LC_CONF_XML } lc_conf_type_t; __BLANK_LINE__ typedef enum { LC_VAR_UNKNOWN, LC_VAR_NONE, LC_VAR_STRING, LC_VAR_LONG_LONG, LC_VAR_LONG, LC_VAR_INT, LC_VAR_SHORT, LC_VAR_BOOL, LC_VAR_FILENAME, LC_VAR_DIRECTORY, LC_VAR_SIZE_LONG_LONG, LC_VAR_SIZE_LONG, LC_VAR_SIZE_INT, LC_VAR_SIZE_SHORT, LC_VAR_TIME, LC_VAR_DATE, LC_VAR_SECTION, LC_VAR_SECTIONSTART, LC_VAR_SECTIONEND, LC_VAR_BOOL_BY_EXISTANCE, LC_VAR_SIZE_SIZE_T, LC_VAR_CIDR, LC_VAR_IP, LC_VAR_IP4, LC_VAR_IP6, LC_VAR_ADDR, LC_VAR_ADDR4, LC_VAR_ADDR6, LC_VAR_HOSTNAME, LC_VAR_HOSTNAME4, LC_VAR_HOSTNAME6, LC_VAR_DOUBLE, LC_VAR_FLOAT, LC_VAR_LIST = 0x80 } lc_var_type_t; __BLANK_LINE__ typedef enum { LC_FLAGS_VAR, LC_FLAGS_CMDLINE, LC_FLAGS_ENVIRON, LC_FLAGS_SECTIONSTART, LC_FLAGS_SECTIONEND } lc_flags_t; __BLANK_LINE__ typedef enum { LC_ERR_NONE, LC_ERR_INVCMD, LC_ERR_INVSECTION, LC_ERR_INVDATA, LC_ERR_BADFORMAT, LC_ERR_CANTOPEN, LC_ERR_CALLBACK, LC_ERR_ENOMEM } lc_err_t; __BLANK_LINE__ int lc_process(int argc, char **argv, const char *appname, lc_conf_type_t type, const char *extra); int lc_register_callback(const char *var, char opt, lc_var_type_t type, int (*callback)(const char *, const char *, const char *, const char *, lc_flags_t, void *), void *extra); int lc_register_var(const char *var, lc_var_type_t type, void *data, char opt); lc_err_t lc_geterrno(void); void lc_seterrstr(const char *usererrstr); char *lc_geterrstr(void); int lc_process_file(const char *appname, const char *pathname, lc_conf_type_t type); int lc_handle_type(lc_var_type_t type, const char *value, void *data); void lc_cleanup(void); __BLANK_LINE__ !define LC_CBRET_IGNORESECTION (255) !define LC_CBRET_OKAY (0) !define LC_CBRET_ERROR (-1) __BLANK_LINE__ extern int lc_optind; __BLANK_LINE__ !ifdef __cplusplus } !endif !endif |
< < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |