You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2020/04/06 11:36:55 UTC
[plc4x] 04/04: - Added two profiles to the prerequisiteCheck -
with-c: Checks that Gcc is installed - apache-release: Just added a todo to
add a check if libpcap is installed
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 24f3a7ab634766a0930e921f8b911b8e3127c98e
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Apr 6 13:36:32 2020 +0200
- Added two profiles to the prerequisiteCheck
- with-c: Checks that Gcc is installed
- apache-release: Just added a todo to add a check if libpcap is installed
- Updated the documentation on how to setup for windows (with special warnings for people running windows as a VM)
---
src/main/script/prerequisiteCheck.groovy | 19 ++++++++++++++++++-
src/site/asciidoc/developers/preparing/windows.adoc | 4 ++++
tools/thrift/pom.xml | 2 +-
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/script/prerequisiteCheck.groovy b/src/main/script/prerequisiteCheck.groovy
index d65df48..4f0426b 100644
--- a/src/main/script/prerequisiteCheck.groovy
+++ b/src/main/script/prerequisiteCheck.groovy
@@ -403,6 +403,7 @@ println "Detected Arch: " + arch
println "Enabled profiles:"
def boostEnabled = false
+def cEnabled = false
def cppEnabled = false
def dockerEnabled = false
def dotnetEnabled = false
@@ -411,11 +412,15 @@ def logstashEnabled = false
def pythonEnabled = false
def proxiesEnabled = false
def sandboxEnabled = false
+def apacheReleaseEnabled = false
def activeProfiles = session.request.activeProfiles
for (def activeProfile : activeProfiles) {
if(activeProfile == "with-boost") {
boostEnabled = true
println "boost"
+ } else if(activeProfile == "with-c") {
+ cEnabled = true
+ println "c"
} else if(activeProfile == "with-cpp") {
cppEnabled = true
println "cpp"
@@ -437,6 +442,9 @@ for (def activeProfile : activeProfiles) {
} else if(activeProfile == "with-sandbox") {
sandboxEnabled = true
println "sandbox"
+ } else if(activeProfile == "apache-release") {
+ apacheReleaseEnabled = true
+ println "apache-release"
}
}
println ""
@@ -486,14 +494,19 @@ if(proxiesEnabled) {
if(proxiesEnabled || cppEnabled) {
checkClang()
- checkCmake()
checkGcc()
+ // We should now be using our own version ...
+ //checkCmake()
}
if(javaEnabled) {
checkGit()
}
+if(cEnabled) {
+ checkGcc()
+}
+
if(proxiesEnabled || cppEnabled) {
checkGpp()
}
@@ -511,6 +524,10 @@ if(sandboxEnabled && dockerEnabled) {
checkDocker()
}
+if(apacheReleaseEnabled) {
+ // TODO: Check libpcap is installed
+}
+
if(!allConditionsMet) {
throw new RuntimeException("Not all conditions met, see log for details.")
}
diff --git a/src/site/asciidoc/developers/preparing/windows.adoc b/src/site/asciidoc/developers/preparing/windows.adoc
index 8ae924f..a6348ff 100644
--- a/src/site/asciidoc/developers/preparing/windows.adoc
+++ b/src/site/asciidoc/developers/preparing/windows.adoc
@@ -126,6 +126,10 @@ He have tested WinBuilds with the bundle found http://win-builds.org/doku.php/do
WARNING: Please use the installer. When using the zip distribution and manually adding that to the `PATH` the build will fail without a log output as some binaries can't find some of the DLL files.
+WARNING: When installing in virtual machines. Make sure to run the installer from a path referring to a local hard-disk `C:`, `D:` ... when using Paralells the location of the `Downloads` or `Desktop` is a shared directory on your Mac.
+
+WARNING: When installing in virtual machines. Please *don't* install to any of Windows' `Program Files` directories. Strange things will happen.
+
When running the installer, make sure to select the options:
- Native Windows
- x86_64
diff --git a/tools/thrift/pom.xml b/tools/thrift/pom.xml
index 4bf12ae..bc962e9 100644
--- a/tools/thrift/pom.xml
+++ b/tools/thrift/pom.xml
@@ -140,7 +140,7 @@
</plugins>
</build>
</profile>
- <!-- If C++ is enabled, we need to add another assembly to the build to package the libraries -->
+ <!-- If C# is enabled, we need to add another assembly to the build to package the libraries -->
<profile>
<id>with-dotnet</id>
<properties>