Merge pull request #2132 from hyperledger/develop

Hyperledger Iroha v1.0 Release Candidate 4

.jenkinsci-new/builders/x64-linux-build-steps.groovy

@@ -41,7 +41,8 @@ def testSteps(String buildDir, List environment, String testList) {
 }
 
 def buildSteps(int parallelism, List compilerVersions, String build_type, boolean specialBranch, boolean coverage,
-      boolean testing, String testList, boolean cppcheck, boolean sonar, boolean docs, boolean packagebuild, boolean sanitize, boolean fuzzing, List environment) {
+      boolean testing, String testList, boolean cppcheck, boolean sonar, boolean docs, boolean packagebuild,
+      boolean sanitize, boolean fuzzing, boolean useBTF, List environment) {
   withEnv(environment) {
     scmVars = checkout scm
     def build = load '.jenkinsci-new/build.groovy'
@@ -99,7 +100,8 @@ def buildSteps(int parallelism, List compilerVersions, String build_type, boolea
             -DTESTING=${cmakeBooleanOption[testing]} \
             -DFUZZING=${cmakeBooleanOption[fuzzing]} \
             -DPACKAGE_DEB=${cmakeBooleanOption[packagebuild]} \
-            -DPACKAGE_TGZ=${cmakeBooleanOption[packagebuild]} ${cmakeOptions}")
+            -DPACKAGE_TGZ=${cmakeBooleanOption[packagebuild]} \
+            -DUSE_BTF=${cmakeBooleanOption[useBTF]} ${cmakeOptions}")
           build.cmakeBuild(buildDir, cmakeBuildOptions, parallelism)
         }
         if (testing) {

.jenkinsci-new/builders/x64-mac-build-steps.groovy

@@ -33,7 +33,8 @@ def testSteps(scmVars, String buildDir, List environment, String testList) {
   }
 }
 
-def buildSteps(int parallelism, List compilerVersions, String build_type, boolean coverage, boolean testing, String testList, boolean packagebuild, List environment) {
+def buildSteps(int parallelism, List compilerVersions, String build_type, boolean coverage, boolean testing, String testList,
+       boolean packagebuild, boolean useBTF, List environment) {
   withEnv(environment) {
     scmVars = checkout scm
     def build = load '.jenkinsci-new/build.groovy'
@@ -42,7 +43,7 @@ def buildSteps(int parallelism, List compilerVersions, String build_type, boolea
     buildDir = 'build'
     compilers = vars.compilerMapping()
     cmakeBooleanOption = [ (true): 'ON', (false): 'OFF' ]
-        cmakeBuildOptions = ""
+    cmakeBuildOptions = ""
 
     if (packagebuild){
       cmakeBuildOptions = " --target package "
@@ -58,7 +59,8 @@ def buildSteps(int parallelism, List compilerVersions, String build_type, boolea
         -DCMAKE_BUILD_TYPE=${build_type} \
         -DCOVERAGE=${cmakeBooleanOption[coverage]} \
         -DTESTING=${cmakeBooleanOption[testing]} \
-        -DPACKAGE_TGZ=${cmakeBooleanOption[packagebuild]} ")
+        -DPACKAGE_TGZ=${cmakeBooleanOption[packagebuild]} \
+        -DUSE_BTF=${cmakeBooleanOption[useBTF]} ")
 
         build.cmakeBuild(buildDir, cmakeBuildOptions, parallelism)
       }

.jenkinsci-new/text-variables.groovy

@@ -7,18 +7,15 @@
 // Text variable for jenkins job description
 //
 
-param_chose_opt = 'Default\nBranch commit\nOn open PR\nCommit in Open PR\nBefore merge to trunk\nBefore merge develop\nBefore merge master\nNightly build\nCustom command'
+param_chose_opt = 'Default\nBranch commit\nOn open PR\nCommit in Open PR\nBefore merge to trunk\nCustom command'
 
 param_descriptions = """
 <p>
   <strong>Default</strong> - will automatically chose the correct one based on branch name and build number<br />
   <strong>Branch commit</strong> - Linux/gcc v5; Test: Smoke, Unit;<br />
   <strong>On open PR -</strong> Linux/gcc v5, MacOS/appleclang; Test: Smoke, Unit; Coverage; Analysis: cppcheck, sonar;<br />
   <strong>Commit in Open PR</strong> - Same as Branch commit<br />
-  <strong>Before merge to trunk</strong> - Linux/gcc v5 v7, Linux/clang v6 v7, MacOS/appleclang; Test: ALL; Coverage; Analysis: cppcheck, sonar; Build type: Debug when Release<br />
-  <strong>Before merge develop</strong> - Not implemented<br />
-  <strong>Before merge master</strong> - Not implemented<br />
-  <strong>Nightly build</strong> - Not implemented<br />
+  <strong>Before merge to trunk</strong> - Linux/gcc v5 v7, Linux/clang v6 v7, MacOS/appleclang; Test: ALL; Coverage; Analysis: cppcheck, sonar; Build type: Debug when Release; useBTF=true<br />
   <strong>Custom command</strong> - enter command below, Ex: build_type='Release'; testing=false;<br />
 </p>
 """
@@ -96,7 +93,7 @@ cmd_description = """
       <p><strong>sanitize</strong> = false&nbsp;</p>
       <ul>
          <li>
-            <p>Adds cmakeOptions&nbsp;-DSANITIZE='address;leak'&nbsp;</p>
+            <p>Adds cmakeOptions&nbsp;-DSANITIZE='address;leak'</p>
          </li>
          <li>
             <p>Ex:&nbsp;sanitize=true;</p>
@@ -115,10 +112,10 @@ cmd_description = """
       </ul>
    </li>
    <li>
-      <p><span style="color: #ff0000;"><strong>fuzzing</strong></span> = false&nbsp;</p>
+      <p><span style="color: #ff0000;"><strong>fuzzing</strong></span> = false</p>
       <ul>
          <li>
-            <p>builds fuzzing tests, work only with&nbsp;x64linux_compiler_list = ['clang6']&nbsp;</p>
+            <p>builds fuzzing tests, work only with&nbsp;x64linux_compiler_list = ['clang6']</p>
          </li>
          <li>
             <p>Ex:&nbsp;fuzzing=true; x64linux_compiler_list= ['clang6']; testing = true; testList = "(None)"</p>
@@ -137,7 +134,7 @@ cmd_description = """
       </ul>
    </li>
    <li>
-      <p><span style="color: #ff0000;"><strong>coverage</strong></span> = false&nbsp;</p>
+      <p><span style="color: #ff0000;"><strong>coverage</strong></span> = false </p>
       <ul>
          <li>
             <p>Runs coverage, will run only if&nbsp;testing = true&nbsp;</p>
@@ -148,7 +145,7 @@ cmd_description = """
       </ul>
    </li>
    <li>
-      <p><strong>doxygen</strong> = false (or = true if master|develop|dev )&nbsp;</p>
+      <p><strong>doxygen</strong> = false (or = true if master|develop|dev ) </p>
       <ul>
          <li>
             <p>Build doxygen, if specialBranch== true will publish, if not specialBranch will upload it to jenkins,</p>
@@ -173,15 +170,15 @@ cmd_description = """
       <p><span style="color: #ff0000;"><strong>packageBuild</strong></span> = false&nbsp;</p>
       <ul>
          <li>
-            <p>Build package Work only with&nbsp;build_type = 'Release'&nbsp;and&nbsp;testing=false&nbsp;</p>
+            <p>Build package Work only with&nbsp;build_type = 'Release'&nbsp;and&nbsp;testing=false </p>
          </li>
          <li>
             <p>Ex:&nbsp;packageBuild = true;build_type = 'Release';testing=false</p>
          </li>
       </ul>
    </li>
    <li>
-      <p><strong>pushDockerTag</strong> = 'not-supposed-to-be-pushed'(or = latest if master, or = develop if develop|dev)&nbsp;-</p>
+      <p><strong>pushDockerTag</strong> = 'not-supposed-to-be-pushed'(or = latest if master, or = develop if develop|dev)</p>
       <ul>
          <li>
             <p>if&nbsp;packagePush=true&nbsp;it the name of docker tag that will be pushed</p>
@@ -192,7 +189,7 @@ cmd_description = """
       </ul>
    </li>
    <li>
-      <p><strong>packagePush</strong> = false (or = true if master|develop|dev )&nbsp;-</p>
+      <p><strong>packagePush</strong> = false (or = true if master|develop|dev )</p>
       <ul>
          <li>
             <p>push all packages and docker to the artifactory and docker hub</p>
@@ -202,6 +199,17 @@ cmd_description = """
          </li>
       </ul>
    </li>
+   <li>
+      <p><strong>useBTF</strong> = false </p>
+      <ul>
+         <li>
+            <p>Sets -DUSE_BTF=ON for cmake configuration</p>
+         </li>
+         <li>
+            <p>Ex:useBTF=true</p>
+         </li>
+      </ul>
+   </li>
    <li>
       <p><strong>specialBranch</strong> = false (or = true if master|develop|dev ),</p>
       <ul>

CMakeLists.txt

@@ -79,8 +79,6 @@ option(PACKAGE_TGZ  "Create TGZ package"             OFF)
 option(PACKAGE_RPM  "Create RPM package"             OFF)
 option(PACKAGE_DEB  "Create DEB package"             OFF)
 option(ENABLE_LIBS_PACKAGING "Enable libs packaging" ON)
-option(SWIG_JAVA    "Generate Swig Java bindings"    OFF)
-option(SWIG_CSHARP  "Generate Swig C# bindings"      OFF)
 option(USE_LIBIROHA "Use external model library"     OFF)
 
 
@@ -101,7 +99,6 @@ if(PACKAGE_TGZ OR PACKAGE_ZIP OR PACKAGE_RPM OR PACKAGE_DEB)
   set(USE_BTF OFF)
   set(COVERAGE OFF)
   set(FUZZING OFF)
-  set(SWIG_JAVA OFF)
 endif()
 
 message(STATUS "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
@@ -115,8 +112,6 @@ message(STATUS "-DPACKAGE_TGZ=${PACKAGE_TGZ}")
 message(STATUS "-DPACKAGE_RPM=${PACKAGE_RPM}")
 message(STATUS "-DPACKAGE_DEB=${PACKAGE_DEB}")
 message(STATUS "-DENABLE_LIBS_PACKAGING=${ENABLE_LIBS_PACKAGING}")
-message(STATUS "-DSWIG_JAVA=${SWIG_JAVA}")
-message(STATUS "-DSWIG_CSHARP=${SWIG_CSHARP}")
 
 set(IROHA_SCHEMA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/schema")
 set(SM_SCHEMA_DIR "${PROJECT_SOURCE_DIR}/shared_model/schema")

CONTRIBUTING.md

@@ -88,6 +88,8 @@ Read our [C++ Style Guide](#c-style-guide) and start with beginner-friendly issu
 
 - **Document new code** based on the [Documentation Styleguide](#documentation-styleguide)
 
+- When working with **PRs from forks** check [this manual](https://help.github.com/articles/checking-out-pull-requests-locally)
+
 
 ## Styleguides