Permalink
Browse files

removing optipng output files, modified script to be using its own ex…

…ported path module
  • Loading branch information...
1 parent 871820b commit 69fbd9d22827f370fe1d67ded892d920e7708356 @badunk badunk committed Feb 14, 2013
Showing with 175 additions and 2 deletions.
  1. +172 −0 optipng/src/zlib/configure.log
  2. +3 −2 rebuild-optipng.js
@@ -1890,3 +1890,175 @@ uname = Darwin
--------------------
+--------------------
+./configure --static
+Thu Feb 14 15:36:59 PST 2013
+
+Checking for gcc...
+=== ztest58677.c ===
+extern int getchar();
+int hello() {return getchar();}
+===
+gcc -c -O3 ztest58677.c
+... using gcc
+
+Building static library libz.a version 1.2.7-optipng with gcc.
+
+
+=== ztest58677.c ===
+#include <sys/types.h>
+off64_t dummy = 0;
+===
+gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest58677.c
+ztest58677.c:2: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘dummy’
+(exit code 1)
+Checking for off64_t... No.
+
+=== ztest58677.c ===
+#include <stdio.h>
+int main(void) {
+ fseeko(NULL, 0, 0);
+ return 0;
+}
+===
+gcc -O3 -o ztest58677 ztest58677.c
+Checking for fseeko... Yes.
+
+=== ztest58677.c ===
+#include <string.h>
+#include <errno.h>
+int main() { return strlen(strerror(errno)); }
+===
+gcc -O3 -o ztest58677 ztest58677.c
+Checking for strerror... Yes.
+
+=== ztest58677.c ===
+#include <unistd.h>
+int main() { return 0; }
+===
+gcc -c -O3 ztest58677.c
+Checking for unistd.h... Yes.
+
+=== ztest58677.c ===
+#include <stdarg.h>
+int main() { return 0; }
+===
+gcc -c -O3 ztest58677.c
+Checking for stdarg.h... Yes.
+
+=== ztest58677.c ===
+#include <stdio.h>
+#include <stdarg.h>
+#include "zconf.h"
+int main()
+{
+#ifndef STDC
+ choke me
+#endif
+ return 0;
+}
+===
+gcc -c -O3 ztest58677.c
+Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf().
+
+=== ztest58677.c ===
+#include <stdio.h>
+#include <stdarg.h>
+int mytest(const char *fmt, ...)
+{
+ char buf[20];
+ va_list ap;
+ va_start(ap, fmt);
+ vsnprintf(buf, sizeof(buf), fmt, ap);
+ va_end(ap);
+ return 0;
+}
+int main()
+{
+ return (mytest("Hello%d\n", 1));
+}
+===
+gcc -O3 -o ztest58677 ztest58677.c
+Checking for vsnprintf() in stdio.h... Yes.
+
+=== ztest58677.c ===
+#include <stdio.h>
+#include <stdarg.h>
+int mytest(const char *fmt, ...)
+{
+ int n;
+ char buf[20];
+ va_list ap;
+ va_start(ap, fmt);
+ n = vsnprintf(buf, sizeof(buf), fmt, ap);
+ va_end(ap);
+ return n;
+}
+int main()
+{
+ return (mytest("Hello%d\n", 1));
+}
+===
+gcc -c -O3 ztest58677.c
+Checking for return value of vsnprintf()... Yes.
+
+=== ztest58677.c ===
+#define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+int ZLIB_INTERNAL foo;
+int main()
+{
+ return 0;
+}
+===
+gcc -c -O3 ztest58677.c
+Checking for attribute(visibility) support... Yes.
+
+=== ztest58677.c ===
+#include <stdio.h>
+#define is32(n,t) for(n=1,k=0;n;n<<=1,k++);if(k==32){puts(t);return 0;}
+int main() {
+ int k;
+ unsigned i;
+ unsigned long l;
+ unsigned short s;
+ is32(i, "unsigned")
+ is32(l, "unsigned long")
+ is32(s, "unsigned short")
+ return 1;
+}
+===
+gcc -O3 -DHAVE_HIDDEN ztest58677.c -o ztest58677
+Looking for a four-byte integer type... Found.
+
+ALL = static
+AR = /usr/bin/libtool
+ARFLAGS = -o
+CC = gcc
+CFLAGS = -O3 -DHAVE_HIDDEN
+CPP = gcc -E
+EXE =
+LDCONFIG = ldconfig
+LDFLAGS =
+LDSHARED = gcc
+LDSHAREDLIBC = -lc
+OBJC = $(OBJZ) $(OBJG)
+PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
+RANLIB = ranlib
+SFLAGS = -O3 -fPIC -DHAVE_HIDDEN
+SHAREDLIB =
+SHAREDLIBM =
+SHAREDLIBV =
+STATICLIB = libz.a
+TEST = all teststatic
+VER = 1.2.7-optipng
+Z_U4 = unsigned
+exec_prefix = ${prefix}
+includedir = ${prefix}/include
+libdir = ${exec_prefix}/lib
+mandir = ${prefix}/share/man
+prefix = /usr/local
+sharedlibdir = ${libdir}
+uname = Darwin
+--------------------
+
+
View
@@ -1,15 +1,16 @@
var exec = require('child_process').exec;
var colors = require('colors');
+var path = require('./lib/optipng-bin.js').path;
if (process.platform === 'darwin' || process.platform === 'linux') {
exec('make clean && ./configure && make && make test', {cwd: './optipng/', stdio: 'inherit'}, function(error, stdout, stderr) {
- exec('cp optipng/src/optipng/optipng vendor/osx/', function(err){
+ exec('cp optipng/src/optipng/optipng ' + path, function(err){
if (err) {
console.log(err.red);
return;
}
- console.log('OptiPNG rebuilt successfully for OSX'.green);
+ console.log('OptiPNG rebuilt successfully'.green);
});
});
}

0 comments on commit 69fbd9d

Please sign in to comment.