Revision: 7944
Author: [email protected]
Date: Mon Apr 19 13:10:53 2010
Log: JNI build change, minor fix for NPE, update binaries.
http://code.google.com/p/google-web-toolkit/source/detail?r=7944
Modified:
/changes/jat/csproto/jni/linux/Makefile
/changes/jat/csproto/jni/linux/prebuilt/libshmfutex_linux_x86.so
/changes/jat/csproto/jni/linux/prebuilt/libshmfutex_linux_x86_64.so
/changes/jat/csproto/plugins/common/ShmFutexTransport.h
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff3/libgwt_dev_ff3.so
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff3+/libgwt_dev_ff3+.so
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff35/libgwt_dev_ff35.so
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff36/libgwt_dev_ff36.so
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff3/libgwt_dev_ff3.so
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff3+/libgwt_dev_ff3+.so
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff35/libgwt_dev_ff35.so
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff36/libgwt_dev_ff36.so
/changes/jat/csproto/plugins/xpcom/prebuilt/gwt-dev-plugin.xpi
=======================================
--- /changes/jat/csproto/jni/linux/Makefile Fri Apr 9 08:50:52 2010
+++ /changes/jat/csproto/jni/linux/Makefile Mon Apr 19 13:10:53 2010
@@ -20,14 +20,14 @@
#ARCH = -m32 -march=i686
#ARCHNAME = x86
-ARCH = -m64
-ARCHNAME = x86_64
+ARCH ?= -m64
+ARCHNAME ?= x86_64
# set GWT_TOOLS only if it is not already defined
GWT_TOOLS ?= ../../../tools
GWT_ROOT = ../..
-OBJDIR := $(GWT_ROOT)/build/out/jni/linux
+OBJDIR := $(GWT_ROOT)/build/out/jni/linux/$(ARCHNAME)
OUTDIR := $(GWT_ROOT)/jni/linux/prebuilt
OUT := $(OUTDIR)/libshmfutex_linux_$(ARCHNAME).so
STAGING := $(GWT_ROOT)/build/staging/gwt-linux-0.0.0/
=======================================
--- /changes/jat/csproto/jni/linux/prebuilt/libshmfutex_linux_x86.so Fri
Apr 9 08:50:52 2010
+++ /changes/jat/csproto/jni/linux/prebuilt/libshmfutex_linux_x86.so Mon
Apr 19 13:10:53 2010
Binary file, no diff available.
=======================================
--- /changes/jat/csproto/jni/linux/prebuilt/libshmfutex_linux_x86_64.so Fri
Apr 9 08:50:52 2010
+++ /changes/jat/csproto/jni/linux/prebuilt/libshmfutex_linux_x86_64.so Mon
Apr 19 13:10:53 2010
Binary file, no diff available.
=======================================
--- /changes/jat/csproto/plugins/common/ShmFutexTransport.h Tue Apr 6
13:56:19 2010
+++ /changes/jat/csproto/plugins/common/ShmFutexTransport.h Mon Apr 19
13:10:53 2010
@@ -32,13 +32,15 @@
int readOffset;
int writeOffset;
- inline ShmFutexTransport(const std::string& args)
- : readOffset(0), writeOffset(0) {
- shmFutex = ShmFutex::connectSegment(args.c_str());
- }
+ inline ShmFutexTransport(ShmFutex* shmFutex) : shmFutex(shmFutex),
readOffset(0),
+ writeOffset(0) { }
public:
static inline ShmFutexTransport* create(const std::string& args) {
- return new ShmFutexTransport(args);
+ ShmFutex* shmFutex = ShmFutex::connectSegment(args.c_str());
+ if (!shmFutex) {
+ return 0;
+ }
+ return new ShmFutexTransport(shmFutex);
}
virtual ~ShmFutexTransport();
=======================================
---
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff3/libgwt_dev_ff3.so
Mon Nov 30 17:41:06 2009
+++
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff3/libgwt_dev_ff3.so
Mon Apr 19 13:10:53 2010
File is too large to display a diff.
=======================================
---
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff3+/libgwt_dev_ff3+.so
Mon Nov 30 17:41:06 2009
+++
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff3+/libgwt_dev_ff3+.so
Mon Apr 19 13:10:53 2010
File is too large to display a diff.
=======================================
---
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff35/libgwt_dev_ff35.so
Mon Nov 30 17:41:06 2009
+++
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff35/libgwt_dev_ff35.so
Mon Apr 19 13:10:53 2010
File is too large to display a diff.
=======================================
---
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff36/libgwt_dev_ff36.so
Wed Jan 27 07:05:14 2010
+++
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86-gcc3/ff36/libgwt_dev_ff36.so
Mon Apr 19 13:10:53 2010
File is too large to display a diff.
=======================================
---
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff3/libgwt_dev_ff3.so
Mon Nov 30 17:41:06 2009
+++
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff3/libgwt_dev_ff3.so
Mon Apr 19 13:10:53 2010
File is too large to display a diff.
=======================================
---
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff3+/libgwt_dev_ff3+.so
Mon Nov 30 17:41:06 2009
+++
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff3+/libgwt_dev_ff3+.so
Mon Apr 19 13:10:53 2010
File is too large to display a diff.
=======================================
---
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff35/libgwt_dev_ff35.so
Mon Nov 30 17:41:06 2009
+++
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff35/libgwt_dev_ff35.so
Mon Apr 19 13:10:53 2010
File is too large to display a diff.
=======================================
---
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff36/libgwt_dev_ff36.so
Mon Feb 1 10:54:40 2010
+++
/changes/jat/csproto/plugins/xpcom/prebuilt/extension/lib/Linux_x86_64-gcc3/ff36/libgwt_dev_ff36.so
Mon Apr 19 13:10:53 2010
File is too large to display a diff.
=======================================
--- /changes/jat/csproto/plugins/xpcom/prebuilt/gwt-dev-plugin.xpi Mon Feb
1 10:54:40 2010
+++ /changes/jat/csproto/plugins/xpcom/prebuilt/gwt-dev-plugin.xpi Mon Apr
19 13:10:53 2010
File is too large to display a diff.
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
