* [gentoo-commits] gentoo-x86 commit in dev-lang/squirrel/files: squirrel-2.2.4-supertux-const.patch squirrel-2.2.4-autotools.patch squirrel-2.2.4-stdint.h.patch
@ 2010-03-05 18:45 Markos Chandras (hwoarang)
0 siblings, 0 replies; only message in thread
From: Markos Chandras (hwoarang) @ 2010-03-05 18:45 UTC (permalink / raw
To: gentoo-commits
hwoarang 10/03/05 18:45:34
Added: squirrel-2.2.4-supertux-const.patch
squirrel-2.2.4-autotools.patch
squirrel-2.2.4-stdint.h.patch
Log:
Initial commit for squirrel package. Moved from sunrise. Fixes bug #169051
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-lang/squirrel/files/squirrel-2.2.4-supertux-const.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squirrel/files/squirrel-2.2.4-supertux-const.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squirrel/files/squirrel-2.2.4-supertux-const.patch?rev=1.1&content-type=text/plain
Index: squirrel-2.2.4-supertux-const.patch
===================================================================
diff -r 3e8a1ff66c3c -r bd1cfd3e3cdd sqstdlib/sqstdstream.cpp
--- a/sqstdlib/sqstdstream.cpp Fri Feb 12 20:35:23 2010 -0500
+++ b/sqstdlib/sqstdstream.cpp Fri Feb 12 23:58:35 2010 -0500
@@ -277,7 +277,7 @@
sq_pop(v,1);
}
-SQRESULT declare_stream(HSQUIRRELVM v,SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals)
+SQRESULT declare_stream(HSQUIRRELVM v,const SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals)
{
if(sq_gettype(v,-1) != OT_TABLE)
return sq_throwerror(v,_SC("table expected"));
diff -r 3e8a1ff66c3c -r bd1cfd3e3cdd sqstdlib/sqstdstream.h
--- a/sqstdlib/sqstdstream.h Fri Feb 12 20:35:23 2010 -0500
+++ b/sqstdlib/sqstdstream.h Fri Feb 12 23:58:35 2010 -0500
@@ -14,5 +14,5 @@
SQInteger _stream_flush(HSQUIRRELVM v);
#define _DECL_STREAM_FUNC(name,nparams,typecheck) {_SC(#name),_stream_##name,nparams,typecheck}
-SQRESULT declare_stream(HSQUIRRELVM v,SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals);
+SQRESULT declare_stream(HSQUIRRELVM v,const SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals);
#endif /*_SQSTD_STREAM_H_*/
1.1 dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch?rev=1.1&content-type=text/plain
Index: squirrel-2.2.4-autotools.patch
===================================================================
diff -r d6d89bbc08e5 -r 2ef7f06a679f Makefile
--- a/Makefile Thu Feb 11 15:08:35 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-
-SQUIRREL=.
-MAKE=make
-
-sq32:
- cd squirrel; $(MAKE)
- cd sqstdlib; $(MAKE)
- cd sq; $(MAKE)
-
-sqprof:
- cd squirrel; $(MAKE) sqprof
- cd sqstdlib; $(MAKE) sqprof
- cd sq; $(MAKE) sqprof
-
-sq64:
- cd squirrel; $(MAKE) sq64
- cd sqstdlib; $(MAKE) sq64
- cd sq; $(MAKE) sq64
diff -r d6d89bbc08e5 -r 2ef7f06a679f Makefile.am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.am Wed Feb 17 01:30:01 2010 -0500
@@ -0,0 +1,84 @@
+# autoreconf variables, recommended by libtoolize
+ACLOCAL_FLAGS = -I m4
+
+AM_CPPFLAGS = -Iinclude
+
+# custom installation directories
+examplesdir = $(docdir)/examples
+pkgconfigdir = $(libdir)/pkgconfig
+
+# installed things
+dist_doc_DATA = doc/sqstdlib2.pdf \
+ doc/squirrel2.pdf
+dist_examples_DATA = samples/ackermann.nut \
+ samples/array.nut \
+ samples/class.nut \
+ samples/classattributes.nut \
+ samples/coroutines.nut \
+ samples/delegation.nut \
+ samples/fibonacci.nut \
+ samples/flow.nut \
+ samples/generators.nut \
+ samples/hello.nut \
+ samples/list.nut \
+ samples/loops.nut \
+ samples/matrix.nut \
+ samples/metamethods.nut \
+ samples/methcall.nut \
+ samples/tailstate.nut
+nodist_pkgconfig_DATA = libsqstdlib.pc \
+ libsquirrel.pc
+bin_PROGRAMS = sq/sq
+lib_LTLIBRARIES = libsquirrel.la \
+ libsqstdlib.la
+include_HEADERS = include/sqstdaux.h \
+ include/sqstdblob.h \
+ include/sqstdio.h \
+ include/sqstdmath.h \
+ include/sqstdstring.h \
+ include/sqstdsystem.h \
+ include/squirrel.h
+
+
+# sources for installed things
+
+libsqstdlib_la_SOURCES = sqstdlib/sqstdaux.cpp \
+ sqstdlib/sqstdblob.cpp sqstdlib/sqstdblobimpl.h \
+ sqstdlib/sqstdio.cpp \
+ sqstdlib/sqstdmath.cpp \
+ sqstdlib/sqstdrex.cpp \
+ sqstdlib/sqstdstream.cpp sqstdlib/sqstdstream.h \
+ sqstdlib/sqstdstring.cpp \
+ sqstdlib/sqstdsystem.cpp
+libsqstdlib_la_LDFLAGS = -version-info 0:0:0
+libsqstdlib_la_LIBADD = libsquirrel.la
+
+libsquirrel_la_SOURCES = squirrel/sqapi.cpp \
+ squirrel/sqarray.h \
+ squirrel/sqbaselib.cpp \
+ squirrel/sqclass.cpp squirrel/sqclass.h \
+ squirrel/sqclosure.h \
+ squirrel/sqcompiler.cpp squirrel/sqcompiler.h \
+ squirrel/sqdebug.cpp \
+ squirrel/sqfuncproto.h \
+ squirrel/sqfuncstate.cpp squirrel/sqfuncstate.h \
+ squirrel/sqlexer.cpp squirrel/sqlexer.h \
+ squirrel/sqmem.cpp \
+ squirrel/sqobject.cpp squirrel/sqobject.h \
+ squirrel/sqopcodes.h \
+ squirrel/sqpcheader.h \
+ squirrel/sqstate.cpp squirrel/sqstate.h \
+ squirrel/sqstring.h \
+ squirrel/sqtable.cpp squirrel/sqtable.h \
+ squirrel/squserdata.h \
+ squirrel/squtils.h \
+ squirrel/sqvm.cpp squirrel/sqvm.h
+libsquirrel_la_LDFLAGS = -version-info 0:0:0
+
+sq_sq_SOURCES = sq/sq.c
+sq_sq_LDADD = libsqstdlib.la
+
+EXTRA_DIST = COMPILE COPYRIGHT HISTORY README \
+ doc/sqstdlib2.chm doc/squirrel2.chm \
+ squirrel.dsw sq/sq.dsp squirrel/squirrel.dsp sqstdlib/sqstdlib.dsp \
+ etc/minimal.c etc/test.nut
diff -r d6d89bbc08e5 -r 2ef7f06a679f configure.ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/configure.ac Wed Feb 17 01:30:01 2010 -0500
@@ -0,0 +1,15 @@
+AC_INIT([squirrel],[2.2.4],[http://squirrel-lang.org/])
+
+# recommended by libtoolize:
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
+
+AC_PROG_LIBTOOL
+AC_PROG_CC_C_O
+AC_PROG_CXX
+
+AC_CONFIG_FILES([Makefile
+libsquirrel.pc
+libsqstdlib.pc])
+AC_OUTPUT
diff -r d6d89bbc08e5 -r 2ef7f06a679f libsqstdlib.pc.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/libsqstdlib.pc.in Wed Feb 17 01:30:01 2010 -0500
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE_NAME@
+Description: A library for libsquirrel users
+Version: @VERSION@
+URL: @PACKAGE_BUGREPORT@
+Libs: -L${libdir} -lsqstdlib
+# I don't like hard-coding this here, but it's an internal
+# dependency so it's justified.
+Libs.private: -lsquirrel
+Cflags: -I${includedir}
diff -r d6d89bbc08e5 -r 2ef7f06a679f libsquirrel.pc.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/libsquirrel.pc.in Wed Feb 17 01:30:01 2010 -0500
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE_NAME@
+Description: A dynamic scripting language for games
+Version: @VERSION@
+URL: @PACKAGE_BUGREPORT@
+Libs: -L${libdir} -lsquirrel
+Cflags: -I${includedir}
diff -r d6d89bbc08e5 -r 2ef7f06a679f sq/Makefile
--- a/sq/Makefile Thu Feb 11 15:08:35 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-SQUIRREL= ..
-
-
-OUT= $(SQUIRREL)/bin/sq
-INCZ= -I$(SQUIRREL)/include -I. -I$(SQUIRREL)/sqlibs
-LIBZ= -L$(SQUIRREL)/lib
-LIB= -lsquirrel -lsqstdlib
-
-OBJS= sq.o
-
-SRCS= sq.c
-
-
-sq32:
- g++ -O2 -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
-
-sqprof:
- g++ -O2 -pg -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
-
-sq64:
- g++ -O2 -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
\ No newline at end of file
diff -r d6d89bbc08e5 -r 2ef7f06a679f sqstdlib/Makefile
--- a/sqstdlib/Makefile Thu Feb 11 15:08:35 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-SQUIRREL= ..
-
-
-OUT= $(SQUIRREL)/lib/libsqstdlib.a
-INCZ= -I$(SQUIRREL)/include -I. -Iinclude
-
-SRCS= \
- sqstdblob.cpp \
- sqstdio.cpp \
- sqstdstream.cpp \
- sqstdmath.cpp \
- sqstdsystem.cpp \
- sqstdstring.cpp \
- sqstdaux.cpp \
- sqstdrex.cpp
-
-
-sq32:
- gcc -O2 -fno-rtti -Wall -c $(SRCS) $(INCZ)
- ar rc $(OUT) *.o
- rm *.o
-
-sqprof:
- gcc -O2 -pg -fno-rtti -pie -gstabs -g3 -Wall -c $(SRCS) $(INCZ)
- ar rc $(OUT) *.o
- rm *.o
-sq64:
- gcc -O2 -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ)
- ar rc $(OUT) *.o
- rm *.o
diff -r d6d89bbc08e5 -r 2ef7f06a679f squirrel/Makefile
--- a/squirrel/Makefile Thu Feb 11 15:08:35 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-SQUIRREL= ..
-
-
-OUT= $(SQUIRREL)/lib/libsquirrel.a
-INCZ= -I$(SQUIRREL)/include -I. -Iinclude
-DEFS=
-LIB=
-
-OBJS= \
- sqapi.o \
- sqbaselib.o \
- sqcompiler.o \
- sqdebug.o \
- sqlexer.o \
- sqobject.o \
- sqparser.o \
- sqstate.o \
- sqtable.o \
- sqvm.o \
- sqmem.o \
- sqclass.o
-
-SRCS= \
- sqapi.cpp \
- sqbaselib.cpp \
- sqfuncstate.cpp \
- sqdebug.cpp \
- sqlexer.cpp \
- sqobject.cpp \
- sqcompiler.cpp \
- sqstate.cpp \
- sqtable.cpp \
- sqmem.cpp \
- sqvm.cpp \
- sqclass.cpp
-
-
-
-sq32:
- gcc -O2 -fno-rtti -Wall -c $(SRCS) $(INCZ) $(DEFS)
- ar rc $(OUT) *.o
- rm *.o
-
-sqprof:
- gcc -O2 -pg -fno-rtti -pie -gstabs -g3 -Wall -c $(SRCS) $(INCZ) $(DEFS)
- ar rc $(OUT) *.o
- rm *.o
-
-sq64:
- gcc -O2 -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ) $(DEFS)
- ar rc $(OUT) *.o
- rm *.o
1.1 dev-lang/squirrel/files/squirrel-2.2.4-stdint.h.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squirrel/files/squirrel-2.2.4-stdint.h.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squirrel/files/squirrel-2.2.4-stdint.h.patch?rev=1.1&content-type=text/plain
Index: squirrel-2.2.4-stdint.h.patch
===================================================================
diff -r d6d89bbc08e5 -r 692b7872324b include/squirrel.h
--- a/include/squirrel.h Thu Feb 11 15:08:35 2010 -0500
+++ b/include/squirrel.h Sat Feb 13 01:04:21 2010 -0500
@@ -39,28 +39,22 @@
#define SQUIRREL_API extern
#endif
-#if (defined(_WIN64) || defined(_LP64))
-#define _SQ64
-#endif
+/* Get uintptr_t from a non standard or standard location */
+#ifdef _MSC_VER
+#include <stddef.h>
-#ifdef _SQ64
-#ifdef _MSC_VER
-typedef __int64 SQInteger;
-typedef unsigned __int64 SQUnsignedInteger;
-typedef unsigned __int64 SQHash; /*should be the same size of a pointer*/
-#else
-typedef long SQInteger;
-typedef unsigned long SQUnsignedInteger;
-typedef unsigned long SQHash; /*should be the same size of a pointer*/
-#endif
-typedef int SQInt32;
-#else
-typedef int SQInteger;
-typedef int SQInt32; /*must be 32 bits(also on 64bits processors)*/
-typedef unsigned int SQUnsignedInteger;
-typedef unsigned int SQHash; /*should be the same size of a pointer*/
-#endif
+typedef __int32 SQInt32;
+typedef __int64 SQInt64;
+#else /* _MSC_VER */
+#include <stdint.h>
+typedef int32_t SQInt32;
+typedef int64_t SQInt64;
+#endif /* _MSC_VER */
+
+typedef intptr_t SQInteger;
+typedef uintptr_t SQUnsignedInteger;
+typedef uintptr_t SQHash;
#ifdef SQUSEDOUBLE
typedef double SQFloat;
@@ -68,12 +62,8 @@
typedef float SQFloat;
#endif
-#if defined(SQUSEDOUBLE) && !defined(_SQ64)
-#ifdef _MSC_VER
-typedef __int64 SQRawObjectVal; //must be 64bits
-#else
-typedef long SQRawObjectVal; //must be 64bits
-#endif
+#if defined(SQUSEDOUBLE)
+typedef SQInt64 SQRawObjectVal; /* must be 64 bits */
#define SQ_OBJECT_RAWINIT() { _unVal.raw = 0; }
#else
typedef SQUnsignedInteger SQRawObjectVal; //is 32 bits on 32 bits builds and 64 bits otherwise
@@ -453,4 +443,13 @@
} /*extern "C"*/
#endif
+/*
+ Define for code which depends on squirrel to
+ determine bitiness. IMO, this should be discouraged.
+ --ohnobinki
+*/
+#if (defined(_WIN64) || defined(_LP64))
+#define _SQ64
+#endif
+
#endif /*_SQUIRREL_H_*/
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-05 18:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-05 18:45 [gentoo-commits] gentoo-x86 commit in dev-lang/squirrel/files: squirrel-2.2.4-supertux-const.patch squirrel-2.2.4-autotools.patch squirrel-2.2.4-stdint.h.patch Markos Chandras (hwoarang)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox