Commit Graph

9 Commits

Author SHA1 Message Date
ssrlive
cf3d385492 Synchronize with upstream code. 2021-10-07 16:38:06 +08:00
ssrlive
a812a96fad clang-format find . -regex '.*\.\(cpp\|hpp\|cu\|c\|h\)' -exec clang-format --verbose --style=file -i {} \; 2021-10-07 06:06:52 +00:00
Mauro Carvalho Chehab
1fdf9acbd9 java/Makefile.am: add java sources at the tarball
Right now, the tarball has been generated without the java
sources.

PS.: This change won't affect the build. Just "make dist"
target should be affected by it.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2019-04-29 15:01:43 -03:00
Mauro Carvalho Chehab
15284c3c5b java/Makefile.am: fix build with Java 8
The patch with added support for Java 11 accidentally broke
java 8 support, when it added $(abs_srcdir) to the *.java
files at zbar_jar_SRCS. Revert this change and rework on
Java 11 logic.

The end result is that now the Java 11 logic is cleaner and
easier to maintain. It will also cleanup the "javac -h ."
mess of creating several individual headers that we don't
want at the builddir.

While here, be sure that the produced zbarjni.h file will
be cleaned at "make clean".

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2019-04-26 08:52:55 -03:00
Mauro Carvalho Chehab
b7c045910a Fix Java detection and fix it for newer Java versions
There's a mess at configure.ac at the java detection code,
and on its usage at check-java target.

Place the Java detection code in just one place, reorganizing
the code in a way that it will use the canonical name of the
javac directory as default, in the case JAVA_HOME is not
explicitly set. It will also use the detected JAVA_HOME at

	make check-java

target.

Also, java versions bigger than 8 don't come anymore with
javah. Instead, javac was incremented to produce headers,
but  with a different syntax and more limited features, as
it doesn't allow anymore to generate a single header file
for multiple java sources.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2019-04-26 00:20:43 -03:00
Mauro Carvalho Chehab
86a9ef67ca java: fix some wrong dependencies
If one does just "make check-java", it should solve all
needed dependencies.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2019-02-09 15:22:20 -02:00
Mauro Carvalho Chehab
681b0f305f Makefile.am.inc: enable check-java on local tests
The check-java seems very useful: it already helped to
detect a regression currently introduced.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2019-02-08 19:24:35 -02:00
Mauro Carvalho Chehab
60010ee3aa configure.ac: autodetect JAVA_HOME and junit location
if javac is present, autodetect the location of the JDK
and junit directories.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2019-02-08 16:40:30 -02:00
Mauro Carvalho Chehab
cd5b63e5b5 Update to the very latest version of zbar
zbar was using a 2010 snapshot of its hg tree.
Take a new snapshot to get zbar's improvements.

[Imported from Fedora 26 tree]
2017-03-25 23:04:38 -03:00