[macmultitouch~source-code-repository:6] added some noddy build shell scripts
- From: waynekeenan@kenai.com
- To: commits@macmultitouch.kenai.com
- Subject: [macmultitouch~source-code-repository:6] added some noddy build shell scripts
- Date: Wed, 23 Feb 2011 23:07:49 +0000
Project: macmultitouch
Repository: source-code-repository
Revision: 6
Author: waynekeenan
Date: 2011-02-23 23:07:48 UTC
Link:
Log Message:
------------
added some noddy build shell scripts
Revisions:
----------
6
Modified Paths:
---------------
GlulogicMT.xcodeproj/wayne.pbxuser
src/com/alderstone/multitouch/mac/touchpad/TouchpadObservablejnilib.c
GlulogicMT.xcodeproj/wayne.mode1v3
Added Paths:
------------
runSwing-dist.sh
mkDist.sh
Diffs:
------
Index: GlulogicMT.xcodeproj/wayne.mode1v3
===================================================================
--- GlulogicMT.xcodeproj/wayne.mode1v3 (revision 5)
+++ GlulogicMT.xcodeproj/wayne.mode1v3 (revision 6)
@@ -216,10 +216,10 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
-
<string>B065725D10CB176F00D30AEF</string>
+
<string>B00A89F010CBABC5007C1BAC</string>
<key>history</key>
<array>
-
<string>B065724A10CAF4DF00D30AEF</string>
+
<string>B081EAEE10CBA40B00E48D29</string>
</array>
</dict>
<key>SplitCount</key>
@@ -368,12 +368,12 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
-
<string>B065725C10CB176F00D30AEF</string>
+
<string>B00A89ED10CBABC5007C1BAC</string>
<key>history</key>
<array>
<string>B040A8D90FD142E600C1CB24</string>
<string>B0244360105ACB9B0088A798</string>
-
<string>B00DE06F106814D500DB2410</string>
+
<string>B081EAEB10CBA40B00E48D29</string>
</array>
</dict>
<key>SplitCount</key>
@@ -385,14 +385,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0,
0}, {1069, 584}}</string>
+ <string>{{0,
0}, {1069, 569}}</string>
<key>RubberWindowFrame</key>
<string>0 55
1400 823 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>584pt</string>
+ <string>569pt</string>
</dict>
<dict>
<key>ContentConfiguration</key>
@@ -405,14 +405,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0,
589}, {1069, 193}}</string>
+ <string>{{0,
574}, {1069, 208}}</string>
<key>RubberWindowFrame</key>
<string>0 55
1400 823 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
- <string>193pt</string>
+ <string>208pt</string>
</dict>
</array>
<key>Proportion</key>
@@ -431,9 +431,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>B065724C10CAF4ED00D30AEF</string>
+ <string>B00A89EE10CBABC5007C1BAC</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>B065724D10CAF4ED00D30AEF</string>
+ <string>B00A89EF10CBABC5007C1BAC</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -651,7 +651,7 @@
<key>TableOfContents</key>
<array>
<string>B04ECAC80FCD454E0009741A</string>
- <string>B065725110CAF4ED00D30AEF</string>
+ <string>B00A89F110CBABC5007C1BAC</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@@ -771,13 +771,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>B0244366105ACB9B0088A798</string>
+ <string>B081EAF010CBA40B00E48D29</string>
<string>1C162984064C10D400B95A72</string>
- <string>B0244367105ACB9B0088A798</string>
- <string>B0244368105ACB9B0088A798</string>
- <string>B0244369105ACB9B0088A798</string>
- <string>B024436A105ACB9B0088A798</string>
- <string>B024436B105ACB9B0088A798</string>
+ <string>B081EAF110CBA40B00E48D29</string>
+ <string>B081EAF210CBA40B00E48D29</string>
+ <string>B081EAF310CBA40B00E48D29</string>
+ <string>B081EAF410CBA40B00E48D29</string>
+ <string>B081EAF510CBA40B00E48D29</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
@@ -939,7 +939,7 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
- <string>B0244371105ACC2C0088A798</string>
+ <string>B081EAF610CBA40B00E48D29</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
Index: GlulogicMT.xcodeproj/wayne.pbxuser
===================================================================
--- GlulogicMT.xcodeproj/wayne.pbxuser (revision 5)
+++ GlulogicMT.xcodeproj/wayne.pbxuser (revision 6)
@@ -89,16 +89,16 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 281745391;
- PBXWorkspaceStateSaveDate = 281745391;
+ PBXPerProjectTemplateStateSaveDate = 281781262;
+ PBXWorkspaceStateSaveDate = 281781262;
};
perUserProjectItems = {
- B00DE06F106814D500DB2410 = B00DE06F106814D500DB2410
/* PBXTextBookmark */;
- B0244360105ACB9B0088A798 = B0244360105ACB9B0088A798
/* PBXTextBookmark */;
- B040A8D90FD142E600C1CB24 = B040A8D90FD142E600C1CB24
/* PBXTextBookmark */;
- B065724A10CAF4DF00D30AEF = B065724A10CAF4DF00D30AEF
/* PBXBookmark */;
- B065725C10CB176F00D30AEF = B065725C10CB176F00D30AEF
/* PBXTextBookmark */;
- B065725D10CB176F00D30AEF = B065725D10CB176F00D30AEF
/* PBXTextBookmark */;
+ B00A89ED10CBABC5007C1BAC /* PBXTextBookmark */ =
B00A89ED10CBABC5007C1BAC /* PBXTextBookmark */;
+ B00A89F010CBABC5007C1BAC /* PBXTextBookmark */ =
B00A89F010CBABC5007C1BAC /* PBXTextBookmark */;
+ B0244360105ACB9B0088A798 /* PBXTextBookmark */ =
B0244360105ACB9B0088A798 /* PBXTextBookmark */;
+ B040A8D90FD142E600C1CB24 /* PBXTextBookmark */ =
B040A8D90FD142E600C1CB24 /* PBXTextBookmark */;
+ B081EAEB10CBA40B00E48D29 /* PBXTextBookmark */ =
B081EAEB10CBA40B00E48D29 /* PBXTextBookmark */;
+ B081EAEE10CBA40B00E48D29 /* PBXTextBookmark */ =
B081EAEE10CBA40B00E48D29 /* PBXTextBookmark */;
};
sourceControlManager = 0AB364DA0B2F66FD00788B6C /* Source
Control */;
userBuildSettings = {
@@ -206,20 +206,30 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 3;
- modificationTime = 274386181.318415;
+ modificationTime = 281781246.26118;
originalNumberOfMultipleMatches = 0;
state = 1;
};
- B00DE06F106814D500DB2410 /* PBXTextBookmark */ = {
+ B00A89ED10CBABC5007C1BAC /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = B040A8C60FD1409000C1CB24 /* TouchpadObservablejnilib.c
*/;
- name = "TouchpadObservablejnilib.c: 83";
+ name = "TouchpadObservablejnilib.c: 151";
rLen = 0;
- rLoc = 2527;
+ rLoc = 4071;
rType = 0;
- vrLen = 961;
- vrLoc = 1348;
+ vrLen = 1414;
+ vrLoc = 0;
};
+ B00A89F010CBABC5007C1BAC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = B040A8C60FD1409000C1CB24 /* TouchpadObservablejnilib.c
*/;
+ name = "TouchpadObservablejnilib.c: 147";
+ rLen = 0;
+ rLoc = 3957;
+ rType = 0;
+ vrLen = 1180;
+ vrLoc = 2864;
+ };
B0244360105ACB9B0088A798 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = B0E4E5E8103922300027D4F4 /* Manifest */;
@@ -232,9 +242,9 @@
};
B040A8C60FD1409000C1CB24 /* TouchpadObservablejnilib.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1008, 2106}}";
- sepNavSelRange = "{2527, 0}";
- sepNavVisRange = "{0, 1259}";
+ sepNavIntBoundsRect = "{{0, 0}, {1248, 2223}}";
+ sepNavSelRange = "{3957, 0}";
+ sepNavVisRange = "{2864, 1180}";
sepNavWindowFrame = "{{15, 96}, {1307, 777}}";
};
};
@@ -248,29 +258,25 @@
vrLen = 1776;
vrLoc = 1577;
};
- B065724A10CAF4DF00D30AEF /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = B040A8C60FD1409000C1CB24 /* TouchpadObservablejnilib.c
*/;
- };
- B065725C10CB176F00D30AEF /* PBXTextBookmark */ = {
+ B081EAEB10CBA40B00E48D29 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = B040A8C60FD1409000C1CB24 /* TouchpadObservablejnilib.c
*/;
- name = "TouchpadObservablejnilib.c: 95";
+ name = "TouchpadObservablejnilib.c: 151";
rLen = 0;
- rLoc = 2527;
+ rLoc = 4071;
rType = 0;
- vrLen = 1259;
+ vrLen = 1414;
vrLoc = 0;
};
- B065725D10CB176F00D30AEF /* PBXTextBookmark */ = {
+ B081EAEE10CBA40B00E48D29 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = B040A8C60FD1409000C1CB24 /* TouchpadObservablejnilib.c
*/;
- name = "TouchpadObservablejnilib.c: 1";
- rLen = 691;
- rLoc = 0;
+ name = "TouchpadObservablejnilib.c: 147";
+ rLen = 0;
+ rLoc = 3957;
rType = 0;
- vrLen = 1409;
- vrLoc = 0;
+ vrLen = 1286;
+ vrLoc = 1770;
};
B0E4E5E8103922300027D4F4 /* Manifest */ = {
isa = PBXFileReference;
Index: mkDist.sh
===================================================================
--- mkDist.sh (revision 0)
+++ mkDist.sh (revision 6)
@@ -0,0 +1,4 @@
+cp runSwing-dist.sh dist/runSwing.sh
+cp -r dist/ build/MacMultitouch-SNAPSHOT
+cd build
+tar zcvf ../dist/MacMultitouch-SNAPSHOT.tar.gz MacMultitouch-SNAPSHOT
Index: runSwing-dist.sh
===================================================================
--- runSwing-dist.sh (revision 0)
+++ runSwing-dist.sh (revision 6)
@@ -0,0 +1 @@
+java -cp GlulogicMT.jar -Djava.library.path=.
com.alderstone.multitouch.mac.touchpad.tests.SwingTest
Index: src/com/alderstone/multitouch/mac/touchpad/TouchpadObservablejnilib.c
===================================================================
--- src/com/alderstone/multitouch/mac/touchpad/TouchpadObservablejnilib.c
(revision 5)
+++ src/com/alderstone/multitouch/mac/touchpad/TouchpadObservablejnilib.c
(revision 6)
@@ -25,6 +25,19 @@
#include <unistd.h>
#include <CoreFoundation/CoreFoundation.h>
+
+#include <stdio.h> /* standard C i/o facilities */
+#include <stdlib.h> /* needed for atoi() */
+#include <unistd.h> /* defines STDIN_FILENO, system calls,etc */
+#include <sys/types.h> /* system data type definitions */
+#include <sys/socket.h> /* socket specific definitions */
+#include <netinet/in.h> /* INET constants and stuff */
+#include <arpa/inet.h> /* IP address conversion stuff */
+#include <netdb.h> /* gethostbyname */
+
+
+
+
#define MT_CLASS "com/alderstone/multitouch/mac/touchpad/TouchpadObservable"
#define MT_METHOD "mtcallback"
#define MT_SIG "(IDIIFFFFFFFF)V"
@@ -58,7 +71,7 @@
static JavaVM *jvm = NULL;
static MTDeviceRef dev;
-static int shutdown = 0;
+static int mtshutdown = 0;
jclass cls;
jmethodID mid;
@@ -66,7 +79,7 @@
int mtcallback(int device, Finger *data, int nFingers, double timestamp, int
frame) {
JNIEnv *env = NULL;
//if (!(frame % 50)) printf("Native: MT Frame= %d\n", frame);
- if (shutdown) return 0;
+ if (mtshutdown) return 0;
int res = (*jvm)->AttachCurrentThread(jvm, (void**)&env, NULL);
@@ -131,7 +144,7 @@
}
JNIEXPORT jint JNICALL
Java_com_alderstone_multitouch_mac_touchpad_TouchpadObservable_deregisterListener(JNIEnv
*env, jobject this) {
- shutdown=1;
+ mtshutdown=1;
//TODO: should use a sync guard incase mtcallback is dispatching to
Java.
if (initOk) {
stopMT();
|
[macmultitouch~source-code-repository:6] added some noddy build shell scripts |
waynekeenan | 02/23/2011 |
