lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Remove bin2c

Browse source
This commit is contained in:
Eelco Dolstra 2012-10-03 16:54:40 -04:00
parent a562d544d8
commit 7586095504
7 changed files with 4 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -69,9 +69,6 @@ Makefile.in
/scripts/nix-reduce-build /scripts/nix-reduce-build
/scripts/nix-http-export.cgi /scripts/nix-http-export.cgi
# /src/bin2c/
/src/bin2c/bin2c
# /src/bsdiff-4.3/ # /src/bsdiff-4.3/
/src/bsdiff-4.3/bsdiff /src/bsdiff-4.3/bsdiff
/src/bsdiff-4.3/bspatch /src/bsdiff-4.3/bspatch

1
configure.ac
View file

@ -354,7 +354,6 @@ AC_SUBST(tarFlags)
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
src/Makefile src/Makefile
src/bin2c/Makefile
src/boost/Makefile src/boost/Makefile
src/boost/format/Makefile src/boost/format/Makefile
src/libutil/Makefile src/libutil/Makefile

2
src/Makefile.am
View file

@ -1,3 +1,3 @@
SUBDIRS = bin2c boost libutil libstore libmain nix-store nix-hash \ SUBDIRS = boost libutil libstore libmain nix-store nix-hash \
libexpr nix-instantiate nix-env nix-worker nix-setuid-helper \ libexpr nix-instantiate nix-env nix-worker nix-setuid-helper \
nix-log2xml bsdiff-4.3 nix-log2xml bsdiff-4.3

6
src/bin2c/Makefile.am
View file

@ -1,6 +0,0 @@
noinst_PROGRAMS = bin2c
bin2c_SOURCES = bin2c.c
bin2c$(EXEEXT): bin2c.c
$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o bin2c bin2c.c

23
src/bin2c/bin2c.c
View file

@ -1,23 +0,0 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
void print(const char *format, ...)
{
va_list ap;
va_start(ap, format);
if (vprintf(format, ap) < 0) abort();
va_end(ap);
}
int main(int argc, char * * argv)
{
int c;
if (argc != 2) abort();
print("static unsigned char %s[] = { ", argv[1]);
while ((c = getchar()) != EOF) {
print("0x%02x, ", (unsigned char) c);
}
print("0 };\n");
return 0;
}

2
src/libstore/Makefile.am
View file

@ -29,4 +29,4 @@ AM_CXXFLAGS = -Wall \
local-store.lo: schema.sql.hh local-store.lo: schema.sql.hh
%.sql.hh: %.sql %.sql.hh: %.sql
../bin2c/bin2c schema < $< > $@ || (rm $@ && exit 1) sed -e 's/"/\\"/g' -e 's/.*/"\0\\n"/' < $< > $@ || (rm $@ && exit 1)

2
src/libstore/local-store.cc
View file

@ -374,7 +374,9 @@ void LocalStore::openDB(bool create)
/* Initialise the database schema, if necessary. */ /* Initialise the database schema, if necessary. */
if (create) { if (create) {
const char * schema =
#include "schema.sql.hh" #include "schema.sql.hh"
;
if (sqlite3_exec(db, (const char *) schema, 0, 0, 0) != SQLITE_OK) if (sqlite3_exec(db, (const char *) schema, 0, 0, 0) != SQLITE_OK)
throwSQLiteError(db, "initialising database schema"); throwSQLiteError(db, "initialising database schema");
} }