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.

Sign up for GitHub

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

Fix Apache License naming as requested by issue #673. #674

Merged
merged 9 commits into from
Jul 5, 2016
+20 −13
Merged

Fix Apache License naming as requested by issue #673. #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e92987e
Fix Apache License naming as requested by issue #673.
bhamail Jun 30, 2016
7ce123a
fix changes link to PR.
bhamail Jun 30, 2016
058f12a
Staticly link the windows jnidispatch.dll when build with MSVC compiler
matthiasblaesing Jun 18, 2016
5f8e41f
License naming changes suggested in review.
bhamail Jun 30, 2016
adb916e
Merge pull request #675 from matthiasblaesing/static_build_windows
twall Jul 5, 2016
21620b1
Fix Apache License naming as requested by issue #673.
bhamail Jun 30, 2016
2c27007
fix changes link to PR.
bhamail Jun 30, 2016
92661a8
License naming changes suggested in review.
bhamail Jun 30, 2016
090bffc
Merge remote-tracking branch 'origin/ApacheLicense-naming' into Apach…
bhamail Jul 5, 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
0 ASL2.0 → AL2.0
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
NOTE: as of JNA 4.0, JNA is now dual-licensed under LGPL and ASL (see LICENSE).
NOTE: as of JNA 4.0, JNA is now dual-licensed under LGPL and AL 2.0 (see LICENSE).

NOTE: JNI native support is typically incompatible between minor versions, and almost always incompatible between major versions.

Expand Down Expand Up @@ -72,6 +72,8 @@ Bug Fixes
* [#633](https://github.com/java-native-access/jna/pull/633): Restore default usage of platform native encoding for Java strings passed to native functions (was hard-coded to UTF-8 in 4.0 and later) [@amake](https://github.com/amake)
* [#634](https://github.com/java-native-access/jna/pull/634): Improve BSTR handling and add `SysStringByteLen` and `SysStringLen` to `com.sun.jna.platform.win32.OleAuto` - [@matthiasblaesing](https://github.com/matthiasblaesing).
* [#646](https://github.com/java-native-access/jna/issues/646): `platform.win32.COM.COMBindingBaseObject` swallows reason if instantiation fails - [@matthiasblaesing](https://github.com/matthiasblaesing).
* [#674](https://github.com/java-native-access/jna/pull/674): Update references to Apache License as requested by issue #673 [@bhamail](https://github.com/bhamail)
* [#636](https://github.com/java-native-access/jna/issues/636); Staticly link visual c++ runtime when building with MSVC - [@matthiasblaesing](https://github.com/matthiasblaesing).

Release 4.2.1
=============
Expand Down
4 changes: 2 additions & 2 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ A copy is also included in the downloadable source code package
containing JNA, in file "LGPL2.1", under the same directory
as this file.

You may obtain a copy of the ASL License at:
You may obtain a copy of the Apache License at:

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"AL License" is a tautology; it would be better to use "Apache License" here

http://www.apache.org/licenses/

A copy is also included in the downloadable source code package
containing JNA, in file "ASL2.0", under the same directory
containing JNA, in file "AL2.0", under the same directory
as this file.
2 changes: 1 addition & 1 deletion LICENSE.ASL → LICENSE.AL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ You may obtain a copy of the License at:
http://www.apache.org/licenses/

A copy is also included in the downloadable source code package
containing JNA, in file "ASL2.0", under the same directory
containing JNA, in file "AL2.0", under the same directory
as this file.
2 changes: 1 addition & 1 deletion build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
<!-- Javadoc -->
<!-- JNA sources only, for use in Linux build from source/shared libffi -->
<zip zipfile="${dist}/src.zip">
<zipfileset dir="." includes="build.xml,${pom},LICENSE,LGPL2.1,ASL2.0"/>
<zipfileset dir="." includes="build.xml,${pom},LICENSE,LGPL2.1,AL2.0"/>
<zipfileset dir="${src}" includes="**/*.java" prefix="src"/>
<zipfileset dir="${test.src}" includes="**/*.java" prefix="test"/>
<zipfileset dir="${native}" excludes="libffi,libffi/**/*,build,build/**/*" prefix="native"/>
Expand Down
Binary file modified lib/native/win32-x86-64.jar
View file
Open in desktop
Binary file not shown.
Binary file modified lib/native/win32-x86.jar
View file
Open in desktop
Binary file not shown.
13 changes: 9 additions & 4 deletions native/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,24 @@ STRIP=@echo
LIBPFX=
LIBSFX=.dll
TESTLIB_TRUNC=$(BUILD)/testlib-truncated.dll

ifeq ($(ARCH),amd64)
MINGW_PREFIX?=x86_64-w64-mingw32-
FFI_CONFIG+=--host=x86_64-w64-mingw32
# Need windres from mingw distribution, even if building with MSVC
WINDRES=$(MINGW_PREFIX)windres
MINGW=$(MINGW_PREFIX)gcc
else
MINGW_PREFIX?=i686-pc-mingw32-
FFI_CONFIG+=--host=i686-w64-mingw32
MINGW_PREFIX?=i686-w64-mingw32-
endif
# Need windres from mingw distribution, even if building with MSVC
WINDRES=$(MINGW_PREFIX)windres
MINGW=$(MINGW_PREFIX)gcc

ifeq ($(USE_MSVC),true)
# MS compiler
CC=$(FFI_SRC)/msvcc.sh
ifneq ($(DYNAMIC_LIBFFI),true)
CDEFINES+=-DUSE_STATIC_RTL
endif
COPT=
CPP=cl -nologo -EP
LD=link
Expand Down
2 changes: 1 addition & 1 deletion parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<distribution>repo</distribution>
</license>
<license>
<name>ASL, version 2</name>
<name>Apache License v2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
Expand Down
2 changes: 1 addition & 1 deletion pom-jna-platform.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<distribution>repo</distribution>
</license>
<license>
<name>ASL, version 2</name>
<name>Apache License v2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto (and below)

<distribution>repo</distribution>
</license>
Expand Down
4 changes: 2 additions & 2 deletions pom-jna.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<distribution>repo</distribution>
</license>
<license>
<name>ASL, version 2</name>
<name>Apache License v2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
Expand Down Expand Up @@ -50,4 +50,4 @@
</developer>
</developers>

</project>
</project>