Permalink
Browse files

Packaging and text improvements:

Update the RTF read me to be in sync with the MarkDown version.
Mark some parts of the MarkDown read me as code, so they stand out a bit more. That and the parts mentioned are code.
Fix links and descriptions.
Fix the file locations in the build script.
Fix the installer package generator.
  • Loading branch information...
1 parent 4396fda commit bf9948182c77e7791da0383a57d24f796f70a994 @MaddTheSane MaddTheSane committed Jul 11, 2014
@@ -284,6 +284,10 @@
55B6382918C10EBE00CE933D /* WirelessHIDDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WirelessHIDDevice.cpp; sourceTree = "<group>"; };
55B6382A18C10EBE00CE933D /* WirelessHIDDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WirelessHIDDevice.h; sourceTree = "<group>"; };
55DBC492196DF0930079FE88 /* 360Control.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; path = 360Control.iconset; sourceTree = "<group>"; };
+ 55E1C62819708E7300EC9DD8 /* build.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = build.sh; sourceTree = SOURCE_ROOT; };
+ 55E1C62919708E7300EC9DD8 /* clean.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = clean.sh; sourceTree = SOURCE_ROOT; };
+ 55E1C62A19708F8600EC9DD8 /* Readme.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = Readme.md; sourceTree = SOURCE_ROOT; };
+ 55E1C62B1970921E00EC9DD8 /* Readme.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Readme.rtf; sourceTree = SOURCE_ROOT; };
55FE3CA118D7B77800D69E84 /* testhaptic */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testhaptic; sourceTree = BUILT_PRODUCTS_DIR; };
55FE3CAC18D7B7B600D69E84 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = "<absolute>"; };
/* End PBXFileReference section */
@@ -376,6 +380,8 @@
551CE000196EFD34000869B6 /* Scripts */ = {
isa = PBXGroup;
children = (
+ 55E1C62819708E7300EC9DD8 /* build.sh */,
+ 55E1C62919708E7300EC9DD8 /* clean.sh */,
551CE001196EFD34000869B6 /* finish.sh */,
551CE002196EFD34000869B6 /* upgrade.sh */,
);
@@ -385,6 +391,8 @@
551CE003196EFD34000869B6 /* Text */ = {
isa = PBXGroup;
children = (
+ 55E1C62A19708F8600EC9DD8 /* Readme.md */,
+ 55E1C62B1970921E00EC9DD8 /* Readme.rtf */,
551CE004196EFD34000869B6 /* Welcome.rtf */,
);
path = Text;
@@ -57,34 +57,17 @@
<array>
<dict>
<key>CHILDREN</key>
- <array>
- <dict>
- <key>CHILDREN</key>
- <array/>
- <key>GID</key>
- <integer>80</integer>
- <key>PATH</key>
- <string>../build/Release/360Daemon.app</string>
- <key>PATH_TYPE</key>
- <integer>1</integer>
- <key>PERMISSIONS</key>
- <integer>493</integer>
- <key>TYPE</key>
- <integer>3</integer>
- <key>UID</key>
- <integer>0</integer>
- </dict>
- </array>
+ <array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
- <string>360Daemon</string>
+ <string>../build/Release/360Daemon.app</string>
<key>PATH_TYPE</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
- <integer>2</integer>
+ <integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
@@ -485,7 +468,7 @@
<key>GID</key>
<integer>0</integer>
<key>PATH</key>
- <string>../build/Release//WirelessGamingReceiver.kext</string>
+ <string>../build/Release/WirelessGamingReceiver.kext</string>
<key>PATH_TYPE</key>
<integer>1</integer>
<key>PERMISSIONS</key>
@@ -641,7 +624,7 @@
ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp
dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u
dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD
- b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjExODcuMzQiPgo8c3R5bGUg
+ b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjEyNjUuMjEiPgo8c3R5bGUg
dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5
Pgo8L2JvZHk+CjwvaHRtbD4K
</data>
@@ -16,6 +16,10 @@ if [ -d /Library/Application\ Support/MICE/360Daemon ]; then
/bin/rm -r /Library/Application\ Support/MICE/360Daemon
fi
+if [ -d /Library/Application\ Support/MICE/360Daemon.app ]; then
+ /bin/rm -r /Library/Application\ Support/MICE/360Daemon.app
+fi
+
# Remove preference pane
if [ -d /Library/PreferencePanes/Pref360Control.prefPane ]; then
View
@@ -49,17 +49,18 @@ functional.
- Extra settings? E.g. trigger deadzones, control remapping.
- Someone has requested old Xbox Controller support too.
-- ****\
-- **Contact me**
+**Contact me**
+
- Please feel free to contact me with any comments, questions and so
on using the form at the URL at the top of the file.
-- \
-- **Developer info**
+
+**Developer info**
+
- Anything below this probably doesn't affect end users, so you can
stop reading now if you just want to use the driver.
-**Building**
+***Building***
(This section does not yet discuss the source of the wireless drivers)
@@ -77,32 +78,32 @@ project includes a script to copy the Feedback360 bundle to the correct
place in the .kext to make it work.
-To debug the driver, sudo cp -R 360Controller.kext /tmp/ to assign the
+To debug the driver, `sudo cp -R 360Controller.kext /tmp/` to assign the
correct properties - note that the Force Feedback plugin only seems to
-be found by OSX if the driver is in /System/Library/Extensions so I
+be found by OSX if the driver is in `/System/Library/Extensions` so I
could only debug it in place.
To test the Preference Pane, just double-click the resulting file.
-**Debugging**
+***Debugging***
Most of the debugging I did was via printing out text. In 360Controller,
you can use IOLog(), and the output will appear in system.log. In
-Feedback360 normal fprintf(stderr,...), and the output will appear on
+Feedback360 normal `fprintf(stderr,...)`, and the output will appear on
the console of whatever application is attempting to use Force Feedback.
-In Pref360Control NSLog() works as it's an Objective C program, and will
+In Pref360Control, `NSLog()` works as it's an Objective C program, and will
output to the console of the Preferences application.
-**Installer**
+***Installer***
-Included is an installer project for Packages. Download Iceberg at
+Included is an installer project for Packages. Download Packages at
[http://s.sudre.free.fr/Software/Packages/about.html](http://s.sudre.free.fr/Software/Packages/about.html)
-**Other information**
+***Other information***
I wrote the driver from scratch, using Apple documentation and drivers
simply as a reference and not basing it upon any existing source. As
@@ -111,4 +112,4 @@ weirdness. I've also tried to include comments to explain generally
what's going on :)
The calculations for the updated Feedback360 plugin are based on the
-unmaintained xi driver for Windows.
+unmaintained xi driver for Windows.
View
@@ -1,10 +1,10 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}
{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid101\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid2}}
{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}}
-\paperw12240\paperh15840\margl1440\margr1440\vieww9000\viewh8400\viewkind0
+\margl1440\margr1440\vieww9000\viewh8400\viewkind0
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
\f0\b\fs36 \cf0 XBox 360 Controller driver for Mac OS X
@@ -36,10 +36,7 @@ The driver exposes a standard game pad with a number of standard controls, so an
\b Known Problems/Todo
\b0 \
\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural
-\ls1\ilvl0\cf0 {\listtext \'95 }The rumble motor test on the triggers of the Preference Pane bypasses the Force Feedback Framework functionality, so isn't actually testing it. It really should, for completeness (and it'd help adding support for more complex effects) - this test is now disabled in the normal release anyway\
-{\listtext \'95 }Force Feedback plugin may make effects run slower (e.g. longer time) than they should\
-{\listtext \'95 }Driver probably needs to be more resilient to errors and odd cases\
-{\listtext \'95 }Better Force Feedback "emulation"\
+\ls1\ilvl0\cf0 {\listtext \'95 }Driver probably needs to be more resilient to errors and odd cases\
{\listtext \'95 }Extra settings? E.g. trigger deadzones, control remapping.\
{\listtext \'95 }Someone has requested old Xbox Controller support too.\
\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural
@@ -77,10 +74,11 @@ Most of the debugging I did was via printing out text. In 360Controller, you can
\b Installer
\b0 \
-Included is an installer project for Iceberg. Download Iceberg at {\field{\*\fldinst{HYPERLINK "http://s.sudre.free.fr/Software/Iceberg.html"}}{\fldrslt http://s.sudre.free.fr/Software/Iceberg.html}}\
+Included is an installer project for Packages. Download Packages at {\field{\*\fldinst{HYPERLINK "http://s.sudre.free.fr/Software/Packages/about.html"}}{\fldrslt http://s.sudre.free.fr/Software/Packages/about.html}}\
\
\b Other information
\b0 \
I wrote the driver from scratch, using Apple documentation and drivers simply as a reference and not basing it upon any existing source. As such, some things may be done strangely or incorrectly, so excuse any weirdness. I've also tried to include comments to explain generally what's going on :)\
-}
+\
+The calculations for the updated Feedback360 plugin are based on the unmaintained xi driver for Windows.}
View
@@ -16,20 +16,20 @@ hdiutil create -srcfolder 360ControllerInstall -format UDZO ../build/360Controll
mv 360ControllerInstall build
cd ..
echo "** File contents **"
-xcrun lipo -info 360Controller/build/Deployment/360Controller.kext/Contents/MacOS/360Controller
-xcrun lipo -info 360Controller/build/Deployment/360Controller.kext/Contents/PlugIns/Feedback360.plugin/Contents/MacOS/Feedback360
-xcrun lipo -info 360Daemon/build/Release/360Daemon
-xcrun lipo -info Pref360Control/build/Deployment/Pref360Control.prefPane/Contents/MacOS/Pref360Control
-xcrun lipo -info Pref360Control/build/Deployment/Pref360Control.prefPane/Contents/Resources/DriverTool
-xcrun lipo -info WirelessGamingReceiver/build/Release/WirelessGamingReceiver.kext/Contents/MacOS/WirelessGamingReceiver
-xcrun lipo -info Wireless360Controller/build/Release/Wireless360Controller.kext/Contents/MacOS/Wireless360Controller
+xcrun lipo -info build/Release/360Controller.kext/Contents/MacOS/360Controller
+xcrun lipo -info build/Release/360Controller.kext/Contents/PlugIns/Feedback360.plugin/Contents/MacOS/Feedback360
+xcrun lipo -info build/Release/360Daemon.app/Contents/MacOS/360Daemon
+xcrun lipo -info build/Release/Pref360Control.prefPane/Contents/MacOS/Pref360Control
+xcrun lipo -info build/Release/Pref360Control.prefPane/Contents/Resources/DriverTool
+xcrun lipo -info build/Release/WirelessGamingReceiver.kext/Contents/MacOS/WirelessGamingReceiver
+xcrun lipo -info build/Release/Wireless360Controller.kext/Contents/MacOS/Wireless360Controller
echo "** File signatures **"
-xcrun spctl -a -v 360Controller/build/Deployment/360Controller.kext
-xcrun spctl -a -v 360Controller/build/Deployment/360Controller.kext/Contents/PlugIns/Feedback360.plugin
-xcrun spctl -a -v 360Daemon/build/Release/360Daemon
-xcrun spctl -a -v Pref360Control/build/Deployment/Pref360Control.prefPane
-xcrun spctl -a -v Pref360Control/build/Deployment/Pref360Control.prefPane/Contents/Resources/DriverTool
-xcrun spctl -a -v WirelessGamingReceiver/build/Release/WirelessGamingReceiver.kext
-xcrun spctl -a -v Wireless360Controller/build/Release/Wireless360Controller.kext
+xcrun spctl -a -v build/Release/360Controller.kext
+xcrun spctl -a -v build/Release/360Controller.kext/Contents/PlugIns/Feedback360.plugin
+xcrun spctl -a -v build/Release/360Daemon.app/Contents/MacOS/360Daemon
+xcrun spctl -a -v build/Release/Pref360Control.prefPane
+xcrun spctl -a -v build/Release/Pref360Control.prefPane/Contents/Resources/DriverTool
+xcrun spctl -a -v build/Release/WirelessGamingReceiver.kext
+xcrun spctl -a -v build/Release/Wireless360Controller.kext
xcrun spctl -a -v --type install Install360Controller/build/Install360Controller.pkg
echo "*** DONE ***"

0 comments on commit bf99481

Please sign in to comment.