Add support for Windows builds.

We can now publish Windows binaries for tox4j.

Author: iphydf

BUILD.bazel

@@ -1,18 +1,29 @@
-load("@rules_java//java:defs.bzl", "java_test")
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_proto_library")
+load("@rules_java//java:defs.bzl", "java_test")
 load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library", "scala_test")
 load("@io_bazel_rules_scala//scala_proto:scala_proto.bzl", "scalapb_proto_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("//tools/project:build_defs.bzl", "project")
 
 project()
 
+# If you are on Windows, the relative path below doesn't work, so you'll need
+# to use an absolute path like below. If you find a way to make this work with
+# relative paths, please send a pull request.
+USER = "iphydf"
+
+JVM_FLAGS = select({
+    "//tools/config:windows": ["-Djava.library.path=C:/Users/%s/source/repos/toktok-stack/bazel-bin/jvm-toxcore-c" % USER],
+    "//conditions:default": ["-Djava.library.path=jvm-toxcore-c"],
+})
+
 genrule(
     name = "copy_link_jni_md_header",
     srcs = select({
         "//tools/config:freebsd": ["@bazel_tools//tools/jdk:jni_md_header-freebsd"],
         "//tools/config:linux": ["@bazel_tools//tools/jdk:jni_md_header-linux"],
         "//tools/config:osx": ["@bazel_tools//tools/jdk:jni_md_header-darwin"],
+        "//tools/config:windows": ["@bazel_tools//tools/jdk:jni_md_header-windows"],
     }),
     outs = ["cpp/src/jni_md.h"],
     cmd = "cp -f $< $@",
@@ -54,9 +65,6 @@ cc_binary(
         ":cpp/src/jni_md.h",
     ],
     copts = [
-        "-Wno-error=switch",
-        "-Wno-parentheses",
-        "-std=c++14",
         "-DHAVE_TO_STRING",
     ],
     includes = [
@@ -67,6 +75,7 @@ cc_binary(
         "//tools/config:freebsd": ["-Wl,--version-script,$(location cpp/src/libtox4j-c.ld)"],
         "//tools/config:linux": ["-Wl,--version-script,$(location cpp/src/libtox4j-c.ld)"],
         "//tools/config:osx": [],
+        "//tools/config:windows": [],
     }),
     linkshared = True,
     deps = [
@@ -83,12 +92,20 @@ genrule(
     cmd = "cp $< $@",
 )
 
+genrule(
+    name = "native_windows",
+    srcs = [":libtox4j-c.so"],
+    outs = ["tox4j-c.dll"],
+    cmd = "cp $< $@",
+)
+
 filegroup(
     name = "native",
     srcs = select({
         "//tools/config:freebsd": [":libtox4j-c.so"],
         "//tools/config:linux": [":libtox4j-c.so"],
         "//tools/config:osx": [":libtox4j-c.dylib"],
+        "//tools/config:windows": [":tox4j-c.dll"],
     }),
     visibility = ["//visibility:public"],
 )
@@ -104,8 +121,8 @@ scala_library(
         ":jni_scala_proto",
         "//jvm-macros",
         "//jvm-toxcore-api",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_11",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_typesafe_scala_logging_scala_logging_2_11",
         "@maven//:org_jetbrains_annotations",
         "@maven//:org_slf4j_slf4j_api",
     ],
@@ -173,9 +190,9 @@ scala_library(
         ":jvm-toxcore-c",
         "//jvm-macros",
         "//jvm-toxcore-api",
+        "@io_bazel_rules_scala//scala/scalatest",
         "@maven//:com_chuusai_shapeless_2_11",
         "@maven//:com_typesafe_scala_logging_scala_logging_2_11",
-        "@io_bazel_rules_scala//scala/scalatest",
         "@maven//:org_jetbrains_annotations",
         "@maven//:org_scalacheck_scalacheck_2_11",
         "@maven//:org_slf4j_slf4j_api",
@@ -187,7 +204,7 @@ scala_library(
     size = "small",
     srcs = [src],
     data = [":native"],
-    jvm_flags = ["-Djava.library.path=jvm-toxcore-c"],
+    jvm_flags = JVM_FLAGS,
     resources = glob([
         "src/test/resources/**/*",
     ]),
@@ -199,13 +216,15 @@ scala_library(
         "//jvm-macros",
         "//jvm-toxcore-api",
         "@maven//:com_chuusai_shapeless_2_11",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_11",
         "@maven//:com_google_guava_guava",
-        "@maven//:log4j_log4j",
+        "@maven//:com_typesafe_scala_logging_scala_logging_2_11",
         "@maven//:org_apache_commons_commons_lang3",
         "@maven//:org_jetbrains_annotations",
         "@maven//:org_scalacheck_scalacheck_2_11",
         "@maven//:org_slf4j_slf4j_api",
+    ],
+    runtime_deps = [
+        "@maven//:log4j_log4j",
         "@maven//:org_slf4j_slf4j_log4j12",
     ],
 ) for src in glob(["src/test/java/**/*Test.scala"])]
@@ -215,7 +234,7 @@ scala_library(
     size = "small",
     srcs = [src],
     data = [":native"],
-    jvm_flags = ["-Djava.library.path=`dirname $(location :native)`"],
+    jvm_flags = JVM_FLAGS,
     resources = glob([
         "src/test/resources/**/*",
     ]),
@@ -224,8 +243,10 @@ scala_library(
         "//jvm-toxcore-api",
         "@io_bazel_rules_scala//scala/scalatest",
         "@maven//:junit_junit",
-        "@maven//:log4j_log4j",
         "@maven//:org_slf4j_slf4j_api",
+    ],
+    runtime_deps = [
+        "@maven//:log4j_log4j",
         "@maven//:org_slf4j_slf4j_log4j12",
     ],
 ) for src in glob(["src/test/java/**/*.java"])]
@@ -269,7 +290,7 @@ scala_test(
     size = "small",
     srcs = ["src/tools/java/im/tox/tox4j/av/callbacks/audio/AudioReceiveFrameCallbackShow.scala"],
     data = [":native"],
-    jvm_flags = ["-Djava.library.path=jvm-toxcore-c"],
+    #jvm_flags = JVM_FLAGS,
     resources = glob([
         "src/test/resources/**/*",
     ]),
@@ -278,11 +299,13 @@ scala_test(
         ":jvm-toxcore-c",
         ":test_lib",
         "//jvm-toxcore-api",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_11",
         "@io_bazel_rules_scala//scala/scalatest",
-        "@maven//:log4j_log4j",
+        "@maven//:com_typesafe_scala_logging_scala_logging_2_11",
         "@maven//:org_jetbrains_annotations",
         "@maven//:org_slf4j_slf4j_api",
+    ],
+    runtime_deps = [
+        "@maven//:log4j_log4j",
         "@maven//:org_slf4j_slf4j_log4j12",
     ],
 )
@@ -298,7 +321,7 @@ scala_test(
         "src/tools/java/im/tox/tox4j/av/callbacks/video/VideoReceiveFrameCallbackShow.scala",
     ],
     data = [":native"],
-    jvm_flags = ["-Djava.library.path=jvm-toxcore-c"],
+    jvm_flags = JVM_FLAGS,
     resources = glob([
         "src/test/resources/**/*",
     ]),
@@ -307,13 +330,15 @@ scala_test(
         ":jvm-toxcore-c",
         ":test_lib",
         "//jvm-toxcore-api",
+        "@io_bazel_rules_scala//scala/scalatest",
         "@maven//:com_chuusai_shapeless_2_11",
         "@maven//:com_typesafe_scala_logging_scala_logging_2_11",
-        "@io_bazel_rules_scala//scala/scalatest",
-        "@maven//:log4j_log4j",
         "@maven//:org_jetbrains_annotations",
-        "@maven//:org_scala_lang_modules_scala_swing",
+        "@maven//:org_scala_lang_modules_scala_swing_2_11",
         "@maven//:org_slf4j_slf4j_api",
+    ],
+    runtime_deps = [
+        "@maven//:log4j_log4j",
         "@maven//:org_slf4j_slf4j_log4j12",
     ],
 )

cpp/src/ToxAv/av.cpp

@@ -25,7 +25,7 @@ TOX_METHOD (jbyteArray, Iterate,
   return instances.with_instance (env, instanceNumber,
     [=] (ToxAV *av, Events &events) -> jbyteArray
       {
-        LogEntry log_entry (instanceNumber, toxav_iterate, av);
+        InstanceLogEntry log_entry (instanceNumber, toxav_iterate, av);
 
 #if 0
         log_entry.print_result (toxav_iterate, av, &events);

cpp/src/ToxCore/ToxCore.h

@@ -28,26 +28,57 @@ namespace core
 }
 
 
-template<typename T, size_t get_size (Tox const *), void get_data (Tox const *, T *)>
+template<typename ConvertT, typename T>
+struct convert_vector
+{
+  static std::vector<ConvertT>
+  value (std::vector<T> vec)
+  {
+    return std::vector<ConvertT> (vec.begin (), vec.end ());
+  }
+};
+
+template<typename ConvertT>
+struct convert_vector<ConvertT, ConvertT>
+{
+  static std::vector<ConvertT>
+  value (std::vector<ConvertT> vec)
+  {
+    return vec;
+  }
+};
+
+
+template<
+  typename T,
+  size_t get_size (Tox const *),
+  void get_data (Tox const *, T *),
+  typename ConvertT = T
+>
 struct get_vector
 {
   static bool register_funcs_0 ();
 
-  static std::vector<T>
+  static std::vector<ConvertT>
   make (Tox const *tox)
   {
-    std::vector<T> name (get_size (tox));
-    get_data (tox, name.data ());
+    std::vector<T> vec (get_size (tox));
+    get_data (tox, vec.data ());
 
     assert (register_funcs_0 ());
 
-    return name;
+    return convert_vector<ConvertT, T>::value (std::move (vec));
   }
 };
 
-template<typename T, size_t get_size (Tox const *), void get_data (Tox const *, T *)>
+template<
+  typename T,
+  size_t get_size (Tox const *),
+  void get_data (Tox const *, T *),
+  typename ConvertT
+>
 bool
-get_vector<T, get_size, get_data>::register_funcs_0 ()
+get_vector<T, get_size, get_data, ConvertT>::register_funcs_0 ()
 {
   REGISTER_FUNCS (
     reinterpret_cast<uintptr_t> (make),

cpp/src/ToxCore/connection.cpp

@@ -103,7 +103,7 @@ TOX_METHOD (jbyteArray, Iterate,
   return instances.with_instance (env, instanceNumber,
     [=] (Tox *tox, Events &events) -> jbyteArray
       {
-        LogEntry log_entry (instanceNumber, tox_iterate, tox);
+        InstanceLogEntry log_entry (instanceNumber, tox_iterate, tox);
 
         log_entry.print_result (tox_iterate, tox, &events);
         if (events.ByteSizeLong () == 0)

cpp/src/ToxCore/friendlist.cpp

@@ -94,6 +94,7 @@ TOX_METHOD (jintArray, SelfGetFriendList,
   return instances.with_instance_noerr (env, instanceNumber,
     get_vector<uint32_t,
       tox_self_get_friend_list_size,
-      tox_self_get_friend_list>::make
+      tox_self_get_friend_list,
+      jint>::make
   );
 }

cpp/src/tox/common.h

@@ -107,7 +107,7 @@ namespace tox
     { };
 
 
-    template<typename Subsystem, typename Sig, void Set (Subsystem *, Sig, void *)>
+    template<typename Subsystem, typename Sig, void Set (Subsystem *, Sig *, void *)>
     struct cb
       : mk_tox_cb<Subsystem, Sig>::template func<Set>
     { };

cpp/src/tox4j/ToxInstances.h

@@ -330,7 +330,7 @@ struct ToxInstances
       [&] (Object *tox, Events &events)
         {
           unused (events);
-          LogEntry log_entry (instanceNumber, tox_func, tox, args...);
+          InstanceLogEntry log_entry (instanceNumber, tox_func, tox, args...);
           return ::with_error_handling<Object> (
             log_entry, env, success_func,
             tox_func, tox, std::forward<Args> (args)...
@@ -376,7 +376,7 @@ struct ToxInstances
       [&] (Object *tox, Events &events)
         {
           unused (events);
-          LogEntry log_entry (instanceNumber, tox_func, tox, args...);
+          InstanceLogEntry log_entry (instanceNumber, tox_func, tox, args...);
           return conversions<ToxFunc, Object *, Args...>::to_java (
             env, log_entry, tox_func, tox, std::forward<Args> (args)...
           );

cpp/src/util/debug_log.cpp

@@ -46,6 +46,16 @@ JniLog::Entry::Entry (data *log, protolog::JniLogEntry *entry, std::unique_lock<
 }
 
 
+JniLog::Entry::Entry(Entry &&rhs)
+  : log_ (rhs.log_)
+  , entry_ (rhs.entry_)
+  , lock_ (std::move (rhs.lock_))
+{
+  rhs.log_ = nullptr;
+  rhs.entry_ = nullptr;
+}
+
+
 JniLog::Entry::~Entry ()
 {
   // Check if this entry needs to be filtered out.
@@ -280,7 +290,7 @@ print_arg<std::vector<uint8_t>> (protolog::Value &value, std::vector<uint8_t> co
 
 template<>
 void
-print_arg<std::vector<uint32_t>> (protolog::Value &value, std::vector<uint32_t> const &data)
+print_arg<std::vector<jint>> (protolog::Value &value, std::vector<jint> const &data)
 {
   value.set_v_string ("int[" + std::to_string (data.size ()) + "]");
 }