Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

I need a bluecove-2.1.2jar, but I won't Maven pack it #9

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6cf702c
- Added .gitignore to allow clean commits
ma-ku Apr 26, 2013
08ebf6c
Modified bluecove to work with OS X 10.8
ma-ku Apr 26, 2013
19ce729
Added .gitignore to exclude the maven artifacts
ma-ku Apr 26, 2013
cd0c540
Some more exclusions
ma-ku Apr 26, 2013
d20953a
More exclusions to get rid of Xcode artifacts
ma-ku Apr 26, 2013
e949624
Fixed problems with string conversion
ma-ku Apr 26, 2013
6038a50
Modified project POM to reflect contribution
ma-ku Apr 26, 2013
dd9abcf
Updated project to reflect latest build environment (OS X)
ma-ku Apr 26, 2013
ef7334e
Streamlined ignores (finally)
ma-ku Apr 26, 2013
6391277
Fix crash due to incorrect array initialization.
Sep 6, 2013
b8267d2
Fixed crash due to incorrect allocation of NSDate. Fixed some logical…
Sep 6, 2013
403515a
Fixed a leak.
Sep 6, 2013
731aa73
Fixed regression with OSX 10.8 update due to incorrect use of dispatc…
Sep 8, 2013
f09c36f
Fixed regression in OSX 10.8 update (deadlock when dispatching BTOper…
Sep 8, 2013
df3b7b1
Fixed issues with latest SDK
ma-ku Nov 7, 2013
979c47a
set failonerror to false in ant delete task (clean-remove-created-fil…
littlefreaky Nov 19, 2013
73880b4
- Implemented the function Java_com_intel_bluetooth_BluetoothStackOSX…
littlefreaky Nov 19, 2013
2884dd1
Revert "- Implemented the function Java_com_intel_bluetooth_Bluetooth…
littlefreaky Nov 19, 2013
6245253
Revert "set failonerror to false in ant delete task (clean-remove-cre…
littlefreaky Nov 19, 2013
2b89a1b
- Implemented the function Java_com_intel_bluetooth_BluetoothStackOSX…
littlefreaky Nov 19, 2013
c11ead4
Merge pull request #3 from revite/master
ma-ku Nov 19, 2013
3c1e0f1
Merge branch 'master' of https://github.com/ma-ku/bluecove
ma-ku Nov 19, 2013
10881b3
- Modified base SDK
ma-ku Nov 19, 2013
e45a980
Merge pull request #5 from stroucki/master
ma-ku Mar 21, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Ignore maven built artifacts
/*/**/.settings
/*/**/.classpath
/*/**/.project
/*/**/target

/*/.settings
/*/.classpath
/*/.project
/*/target

/.project
/.settings

# Ignore user specific files and folders of Xcode
/bluecove/src/main/c/intelbth/bluecove.xcodeproj/project.xcworkspace
21 changes: 21 additions & 0 deletions bluecove/build-native-osx-debug.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/sh

# $Id$

BUILD_ROOT=`pwd`

cd ${BUILD_ROOT}/src/main/c/intelbth

xcodebuild -configuration Debug
BUILD_ERROR_CODE=$?

cd ${BUILD_ROOT}

if [[ ${BUILD_ERROR_CODE} != 0 ]] ; then
exit ${BUILD_ERROR_CODE}
fi

echo ---- Created library ----
otool -fv ${BUILD_ROOT}/src/main/resources/libbluecove.jnilib
echo Copy Library to ${BUILD_ROOT}/target/classes/
cp ${BUILD_ROOT}/src/main/resources/libbluecove.jnilib ${BUILD_ROOT}/target/classes/
14 changes: 14 additions & 0 deletions bluecove/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
<timezone>-5</timezone>
</contributor>


<contributor>
<name>Sam Halliday</name>
<email>[email protected]</email>
Expand All @@ -76,6 +77,19 @@
</roles>
</contributor>

<contributor>
<name>Mathias K�hn</name>
<email>[email protected]</email>
<organization>SYNERVA GmbH</organization>
<organizationUrl>http://www.synerva.de</organizationUrl>
<roles>
<role>developer</role>
<role>developer-OSX</role>
<role>developer-OSX-10.8</role>
</roles>
<timezone>+1</timezone>
</contributor>

<!--
<contributor>
<name></name>
Expand Down
11 changes: 11 additions & 0 deletions bluecove/src/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Do not use resources folder
resources/

main/c/intelbth/bluecove.xcodeproj/xcuserdata
main/c/intelbth/bluecove.xcodeproj/project.workspace
main/c/intelbth/bluecove.xcodeproj/project.workspace/**

main/c/intelbth/build/
main/c/intelbth/DerivedData/

main/c/intelbth/com_intel_bluetooth_*.h
17 changes: 9 additions & 8 deletions bluecove/src/main/c/intelbth/OSXStack.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,14 @@ class OSXStack {
public:
OSXStack();
~OSXStack();

public:
pthread_mutex_t deviceInquiryInProcessMutex;
MPEventID deviceInquiryNotificationEvent;
MPEventID deviceInquiryBusyEvent;
MPEventID deviceInquiryFinishedEvent;

dispatch_semaphore_t deviceInquiryNotificationEvent;
dispatch_semaphore_t deviceInquiryBusyEvent;
dispatch_semaphore_t deviceInquiryFinishedEvent;

volatile BOOL deviceInquiryInProcess;
volatile BOOL deviceInquiryBusy;
volatile BOOL deviceInquiryTerminated;
Expand All @@ -60,7 +62,7 @@ class Runnable {
public:
long magic1b;
long magic2b;
char* name;
const char* name;
int error;

// Data passes and received from thread
Expand All @@ -69,8 +71,7 @@ class Runnable {
int iData;
long lData;
bool bData;
jlong jlData;
void* pData[RUNNABLE_DATA_MAX];
const void* pData[RUNNABLE_DATA_MAX];

long magic1e;
long magic2e;
Expand Down Expand Up @@ -118,4 +119,4 @@ class OSXJNIHelper{
extern OSXStack* stack;
extern jint localDeviceSupportedSoftwareVersion;

#endif // __OSXSTACK_H__
#endif // __OSXSTACK_H__
Loading