Browse Source

Merge pull request 'DPE-62 Fix build for Windows.' (#11) from Ignacio/libpEpTransport:DPE-62 into master

Reviewed-on: https://gitea.pep.foundation/pEp.foundation/libpEpTransport/pulls/11
master
huss 7 months ago
parent
commit
e4fe7310d1
2 changed files with 20 additions and 9 deletions
  1. +19
    -8
      build-gradle/transport/build.gradle
  2. +1
    -1
      build-windows/generate_code.cmd

+ 19
- 8
build-gradle/transport/build.gradle View File

@ -1,3 +1,4 @@
import org.gradle.internal.os.OperatingSystem
plugins {
id 'org.jetbrains.kotlin.jvm' version '1.5.0'
@ -37,19 +38,29 @@ dependencies {
task cleanSrc() {
description = "make clean"
exec{
def command = ['make', 'clean']
workingDir "../../src"
commandLine command
if (!OperatingSystem.current().isWindows()) {
exec {
def command = ['make', 'clean']
workingDir "../../src"
commandLine command
}
}
}
task makeSrc(dependsOn: 'cleanSrc') {
description = "make src"
exec{
def command = ['make', 'all']
workingDir "../../src"
commandLine command
if (OperatingSystem.current().isWindows()) {
exec {
def command = ['cmd', '/c', 'generate_code.cmd']
workingDir "../../build-windows"
commandLine command
}
} else {
exec {
def command = ['make', 'all']
workingDir "../../src"
commandLine command
}
}
}


+ 1
- 1
build-windows/generate_code.cmd View File

@ -2,7 +2,7 @@
SET current_directory=%~dp0
:: YML2 directory is ...\pEpForWindowsAdapterSolution\yml2\
SET yml2_directory=%current_directory:~0,-31%\yml2
SET yml2_directory=%current_directory%..\..\..\pEpForWindowsAdapterSolution\yml2
SET YML2PROC="%yml2_directory%\yml2proc"


Loading…
Cancel
Save