Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to quiche 0.18.0 #571

Merged
merged 2 commits into from Aug 28, 2023
Merged

Update to quiche 0.18.0 #571

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc224a2
Update to quiche 0.18.0
normanmaurer Aug 28, 2023
7e2bb67
exclude building apps
normanmaurer Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions codec-native-quic/pom.xml
View file
Open in desktop
Expand Up @@ -56,7 +56,7 @@
<quicheHomeIncludeDir>${quicheHomeDir}/quiche/include</quicheHomeIncludeDir>
<quicheRepository>https://github.com/cloudflare/quiche</quicheRepository>
<quicheBranch>master</quicheBranch>
<quicheCommitSha>5ddba81a3ab03c0fd4c262d444bded4208013669</quicheCommitSha>
<quicheCommitSha>28ef289f027713cb024e3171ccfa2972fc12a9e2</quicheCommitSha>
<generatedSourcesDir>${project.build.directory}/generated-sources</generatedSourcesDir>
<templateDir>${project.build.directory}/template</templateDir>
<cargoTarget />
Expand Down Expand Up @@ -782,7 +782,7 @@
<equals arg1="${platform}" arg2="android" />
<then>
<exec executable="cargo" failonerror="true" dir="${quicheSourceDir}" resolveexecutable="true">
<arg line="ndk ${cargoTarget} -p ${androidNdkVersion} -- build --features &quot;ffi qlog&quot; --release" />
<arg line="ndk ${cargoTarget} -p ${androidNdkVersion} -- build --exclude quiche_apps --workspace --features &quot;ffi qlog&quot; --release" />
<env key="CFLAGS" value="${extraCflags}" />
<env key="CXXFLAGS" value="${extraCxxflags}" />
<env key="QUICHE_BSSL_PATH" value="${boringsslHomeDir}/" />
Expand All @@ -793,7 +793,7 @@
<equals arg1="${os.detected.name}" arg2="windows" />
<then>
<exec executable="cargo" failonerror="true" dir="${quicheSourceDir}" resolveexecutable="true">
<arg line="build --features &quot;ffi qlog&quot; --release" />
<arg line="build --exclude quiche_apps --workspace --features &quot;ffi qlog&quot; --release" />
<arg value="${cargoTarget}" />
<!-- See https://github.com/cloudflare/quiche/blob/0.7.0/src/build.rs#L73 -->
<env key="DEBUG" value="true" />
Expand All @@ -805,7 +805,7 @@
<equals arg1="${crossCompile}" arg2="linux" />
<then>
<exec executable="cargo" failonerror="true" dir="${quicheSourceDir}" resolveexecutable="true">
<arg line="build --features &quot;ffi qlog&quot; --release" />
<arg line="build --exclude quiche_apps --workspace --features &quot;ffi qlog&quot; --release" />
<arg value="${cargoTarget}" />
<env key="QUICHE_BSSL_PATH" value="${boringsslHomeDir}/" />
<!-- Lets enable frame-pointers so we can profile better -->
Expand All @@ -818,7 +818,7 @@
<equals arg1="${crossCompile}" arg2="mac" />
<then>
<exec executable="cargo" failonerror="true" dir="${quicheSourceDir}" resolveexecutable="true">
<arg line="build --features &quot;ffi qlog&quot; --release" />
<arg line="build --exclude quiche_apps --workspace --features &quot;ffi qlog&quot; --release" />
<env key="CFLAGS" value="${extraCflags}" />
<env key="CXXFLAGS" value="${extraCxxflags}" />
<arg value="${cargoTarget}" />
Expand All @@ -831,7 +831,7 @@
</elseif>
<else>
<exec executable="cargo" failonerror="true" dir="${quicheSourceDir}" resolveexecutable="true">
<arg line="build --features &quot;ffi qlog&quot; --release" />
<arg line="build --exclude quiche_apps --workspace --features &quot;ffi qlog&quot; --release" />
<env key="CFLAGS" value="${extraCflags}" />
<env key="CXXFLAGS" value="${extraCxxflags}" />
<env key="QUICHE_BSSL_PATH" value="${boringsslHomeDir}/" />
Expand Down