From fe13b8202bc67f0e75c863c22e3a35d9744b9fa5 Mon Sep 17 00:00:00 2001 From: JohnE Date: Sun, 10 Feb 2019 16:25:43 -0800 Subject: [PATCH] MOD: decided to add local.properties because i'm tired of the compile error when it is missing, also cleaned docs --- README_DEV.rst | 4 +- ccc-jni/src/main/cpp/CMakeLists.txt.old.del | 3 - docs/{dev_cmake.rst => android_cmake.rst} | 0 docs/dev_gradle | 78 ------------------- docs/gradle | 73 ----------------- docs/nc-wc-ndk | 12 --- docs/proj_agile | 33 -------- docs/proj_agile.rst | 4 +- docs/proj_merging_notes.rst | 26 ------- ...otes_2019-07.rst => weekly_2019-01-01.rst} | 0 docs/weekly_2019-02-11.rst | 19 +++++ local.properties | 2 + 12 files changed, 25 insertions(+), 229 deletions(-) delete mode 100644 ccc-jni/src/main/cpp/CMakeLists.txt.old.del rename docs/{dev_cmake.rst => android_cmake.rst} (100%) delete mode 100644 docs/dev_gradle delete mode 100644 docs/gradle delete mode 100644 docs/nc-wc-ndk delete mode 100644 docs/proj_agile delete mode 100644 docs/proj_merging_notes.rst rename docs/{proj_notes_2019-07.rst => weekly_2019-01-01.rst} (100%) create mode 100644 docs/weekly_2019-02-11.rst create mode 100644 local.properties diff --git a/README_DEV.rst b/README_DEV.rst index cbb7321..6edb9ff 100644 --- a/README_DEV.rst +++ b/README_DEV.rst @@ -6,11 +6,11 @@ DEVELOPER README application details ------------------- * ./wolfssl-lib - - builds source from wolfssl repository!! =) + - builds source from OEM WolfSSL repository!! =) - only needs to be built once (when you want a new library) * ./wolfssl-jni - - JNI for the wolfssl library + - JNI for the WolfSSL library * ./ccc-jni (default main source code) - JNI, java connections to the native binaries diff --git a/ccc-jni/src/main/cpp/CMakeLists.txt.old.del b/ccc-jni/src/main/cpp/CMakeLists.txt.old.del deleted file mode 100644 index c90c802..0000000 --- a/ccc-jni/src/main/cpp/CMakeLists.txt.old.del +++ /dev/null @@ -1,3 +0,0 @@ -# this CMake file is the root, and is used to create the bin folder -# add_subdirectory(wolfssl-oem) -# add_subdirectory(wolfcrypt) diff --git a/docs/dev_cmake.rst b/docs/android_cmake.rst similarity index 100% rename from docs/dev_cmake.rst rename to docs/android_cmake.rst diff --git a/docs/dev_gradle b/docs/dev_gradle deleted file mode 100644 index 7e85d74..0000000 --- a/docs/dev_gradle +++ /dev/null @@ -1,78 +0,0 @@ -[[[ Gradle ]]] - - -[[ gradle command line switches ]] - -# create a default gradle build -$ gradle init - -# show that tasks available -$ gradle tasks - -# clean the tests build, run the tests -$ gradle cleanTest test - -# ignore any task optimization -$ gradle test --rerun-tasks - -# UPDATE gradle wrapper -# (sometimes out of sync with android studio, there is an android plug too -- for gradle, it has specific compatibility) -# android plugin ver 3.1.x+ --> requires Gradle ver 4.4+ -$ gradle wrapper - - - -[[ Gradle Java ]] -https://docs.gradle.org/current/userguide/tutorial_java_projects.html - -[ publish jar ] - - - - - -[[ Install Multiple Gradle Binaries (brew) ]] - -[ Install multiple versions ] -brew versions gradle -git clone https://github.com/Homebrew/homebrew.git -git checkout 0123456 Library/Formula/gradle.rb -brew unlink gradle -Install diff version -brew install ~/scripts/myNewGradeScript.rb - --or-- -brew install Library/Formula/gradle.rb -brew switch gradle 1.9 -brew switch gradle 1.10 - - - -[[ Gradle Preehond Dev Notes ]] - -MODERN -Source: http://blog.paralleluniverse.co/2014/05/01/modern-java/ - - -task deployJar(type: Jar, dependsOn: jar) { - baseName = project.name + '-deploy' - deps = configurations.runtime + configurations.runtime.allArtifacts.files - depClasses = { deps.collect { it.isDirectory() ? it : zipTree(it) } } - from(depClasses) { - exclude 'META-INF/MANIFEST.MF' - } - manifest { - attributes 'Main-Class': 'com.example.redphone.Main' - } -} - - -* What went wrong: -A problem was found with the configuration of task ':startScripts'. -> No value has been specified for property 'mainClassName'. - -myMain = 'com.example.redphone.Main' - -startScripts { - mainClassName = myMain -} - diff --git a/docs/gradle b/docs/gradle deleted file mode 100644 index efc99b3..0000000 --- a/docs/gradle +++ /dev/null @@ -1,73 +0,0 @@ -[[[ Gradle ]]] - - -[[ gradle command line switches ]] - -# create a default gradle build -$ gradle init - -# show that tasks available -$ gradle tasks - -# clean the tests build, run the tests -$ gradle cleanTest test - -# ignore any task optimization -$ gradle test --rerun-tasks - - - -[[ Gradle Java ]] -https://docs.gradle.org/current/userguide/tutorial_java_projects.html - -[ publish jar ] - - - - - -[[ Install Multiple Gradle Binaries (brew) ]] - -[ Install multiple versions ] -brew versions gradle -git clone https://github.com/Homebrew/homebrew.git -git checkout 0123456 Library/Formula/gradle.rb -brew unlink gradle -Install diff version -brew install ~/scripts/myNewGradeScript.rb - --or-- -brew install Library/Formula/gradle.rb -brew switch gradle 1.9 -brew switch gradle 1.10 - - - -[[ Gradle Preehond Dev Notes ]] - -MODERN -Source: http://blog.paralleluniverse.co/2014/05/01/modern-java/ - - -task deployJar(type: Jar, dependsOn: jar) { - baseName = project.name + '-deploy' - deps = configurations.runtime + configurations.runtime.allArtifacts.files - depClasses = { deps.collect { it.isDirectory() ? it : zipTree(it) } } - from(depClasses) { - exclude 'META-INF/MANIFEST.MF' - } - manifest { - attributes 'Main-Class': 'com.example.redphone.Main' - } -} - - -* What went wrong: -A problem was found with the configuration of task ':startScripts'. -> No value has been specified for property 'mainClassName'. - -myMain = 'com.example.redphone.Main' - -startScripts { - mainClassName = myMain -} - diff --git a/docs/nc-wc-ndk b/docs/nc-wc-ndk deleted file mode 100644 index a845051..0000000 --- a/docs/nc-wc-ndk +++ /dev/null @@ -1,12 +0,0 @@ -[[[ Normalized Crypto WolfCrypt NDK ]]] - -[[ Features ]] --uses gradle to build native files --uses NEW CMake (CMake Android plugin) --AEAD crypto support --NO LEGACY. removes legacy crypto support --WolfSSL crypto engine - -FIPS-140 ver available --Quantum-Computing safe crypto - -super-fast NTRU algorithm - diff --git a/docs/proj_agile b/docs/proj_agile deleted file mode 100644 index ac38abd..0000000 --- a/docs/proj_agile +++ /dev/null @@ -1,33 +0,0 @@ -[[[ Agile ]]] - - -[[ Working ]] - -[ Tasks ] -* l@@k at Android Weekly emails -* fixing CMake build - -discover which gradle to target - - -[ Milestone ] -* WolfCrypt compile - - - -[[ Backlog ]] - -[ Milestone ] -* JNI wrapper tests - -RSA Public Key Generation - -AES crypt - -[ Tasks ] -* create "update_wolfssl.sh" script to pull latest from the repository, apply patches, build wolfssl, then copy library files to a "dist" folder for usage. As of right now the build works but the generated files aren''t auto copied. It is generated by hand. - - - -[[ Completed ]] - - - - diff --git a/docs/proj_agile.rst b/docs/proj_agile.rst index 29c38f3..911aa70 100644 --- a/docs/proj_agile.rst +++ b/docs/proj_agile.rst @@ -59,8 +59,8 @@ Completed --------- * WolfSSL compile - * fixing CMake build - -discover which gradle to target --> wolfssl was main gradle app target + - fixing CMake build + - discover which gradle to target --> wolfssl was main gradle app target diff --git a/docs/proj_merging_notes.rst b/docs/proj_merging_notes.rst deleted file mode 100644 index 76c80a4..0000000 --- a/docs/proj_merging_notes.rst +++ /dev/null @@ -1,26 +0,0 @@ -=========================== -WolfSSL + WolfCrypt MERGING -=========================== - -* try to remove build artifacts because build stops working - - - -nc-wc-ndk_JNI - - "ccc", jni wolfcrypt code is compiling (cool) - - - -nc-wc-ndk_WOLFSSL - - wolfSSL is compiling a few times, then STOPs - - - -nc-wc-ndk_MERGE ---------------- - -* hopefully can get both WolfSSL and JNI compiling - - - - - diff --git a/docs/proj_notes_2019-07.rst b/docs/weekly_2019-01-01.rst similarity index 100% rename from docs/proj_notes_2019-07.rst rename to docs/weekly_2019-01-01.rst diff --git a/docs/weekly_2019-02-11.rst b/docs/weekly_2019-02-11.rst new file mode 100644 index 0000000..cd4ab86 --- /dev/null +++ b/docs/weekly_2019-02-11.rst @@ -0,0 +1,19 @@ +=============== +Weekly Progress +=============== + + +WORKING +======= + +* test JNI libs !!! =) + - try some java code that will call a C-hook + + + +ISSUES +====== + + + + diff --git a/local.properties b/local.properties new file mode 100644 index 0000000..549e5f9 --- /dev/null +++ b/local.properties @@ -0,0 +1,2 @@ +sdk.dir=/usr/local/opt/android-sdk +ndk.dir=/usr/local/opt/android-sdk/ndk-bundle