Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
Beyond Protocol
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Beyond AKA
Beyond Protocol
Commits
a8d1982f
Commit
a8d1982f
authored
2 years ago
by
Nicolas Pope
Browse files
Options
Downloads
Patches
Plain Diff
Try powershell env vars
parent
b884ecef
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+3
-1
3 additions, 1 deletion
.gitignore
.gitlab-ci.yml
+3
-4
3 additions, 4 deletions
.gitlab-ci.yml
include/ftl/protocol/config.h
+0
-45
0 additions, 45 deletions
include/ftl/protocol/config.h
with
6 additions
and
50 deletions
.gitignore
+
3
−
1
View file @
a8d1982f
build
\ No newline at end of file
build
**/config.cpp
**/config.h
\ No newline at end of file
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
3
−
4
View file @
a8d1982f
...
...
@@ -30,7 +30,6 @@ code_quality:
only
:
-
main
-
merge_requests
-
tags
tags
:
-
docker
script
:
...
...
@@ -121,7 +120,7 @@ linux:pack:
tags
:
-
docker
need
s
:
[
"
linux:build"
]
dependencie
s
:
[
"
linux:build"
]
script
:
-
DEBIAN_FRONTEND=noninteractive apt update && apt install -y libmsgpackc2 liburiparser1 cmake file
-
cd build
...
...
@@ -160,7 +159,7 @@ windows:build:
-
if (Test-Path build) { Remove-Item build/ -Recurse }
-
mkdir build
-
cd build
-
cmake -DCMAKE_GENERATOR_PLATFORM=x64 -DFTL_VERSION=
%
CI_COMMIT_TAG
%
-DWITH_GNUTLS=TRUE -DGNUTLS_INCLUDE_DIR="C:/Build/bin/gnutls/lib/includes/" -DGNUTLS_LIBRARY="C:/Build/bin/gnutls/lib/libgnutls.dll.a" ..
-
cmake -DCMAKE_GENERATOR_PLATFORM=x64 -DFTL_VERSION=
$Env:
CI_COMMIT_TAG -DWITH_GNUTLS=TRUE -DGNUTLS_INCLUDE_DIR="C:/Build/bin/gnutls/lib/includes/" -DGNUTLS_LIBRARY="C:/Build/bin/gnutls/lib/libgnutls.dll.a" ..
-
'
&
MSBuild.exe
beyond-protocol.sln
-property:Configuration=Release
-nr:false
-maxCpuCount'
windows:test
:
...
...
@@ -193,7 +192,7 @@ windows:pack:
tags
:
-
windows
need
s
:
[
"
windows:build"
]
dependencie
s
:
[
"
windows:build"
]
cache
:
# use artifacts instead if multiple runners available
key
:
$CI_COMMIT_SHORT_SHA
...
...
This diff is collapsed.
Click to expand it.
include/ftl/protocol/config.h
deleted
100644 → 0
+
0
−
45
View file @
b884ecef
/**
* @file config.h
* @copyright Copyright (c) 2020 University of Turku, MIT License
* @author Nicolas Pope
*
* To be CMake processed
*/
#pragma once
#ifdef WIN32
#ifdef BUILD_SHARED
#define FTLEXPORT __declspec(dllexport)
#else
#define FTLEXPORT __declspec(dllimport)
#endif
#else // WIN32
#define FTLEXPORT
#endif
/* #undef HAVE_URIPARSESINGLE */
/* #undef HAVE_LIBARCHIVE */
#define HAVE_GNUTLS
/* #undef HAVE_PYTHON */
/* #undef ENABLE_PROFILER */
extern
const
char
*
FTL_BRANCH
;
extern
const
char
*
FTL_VERSION_LONG
;
extern
const
char
*
FTL_VERSION
;
extern
const
int
FTL_VERSION_MAJOR
;
extern
const
int
FTL_VERSION_MINOR
;
extern
const
int
FTL_VERSION_PATCH
;
extern
const
int
FTL_VERSION_COMMITS
;
extern
const
char
*
FTL_VERSION_SHA1
;
#define FTL_SOURCE_DIRECTORY "/home/nick/repos/beyond-protocol"
#define FTL_LOCAL_CONFIG_ROOT "/home/nick/.config/ftl"
#define FTL_LOCAL_CACHE_ROOT "/home/nick/.cache/ftl"
#define FTL_LOCAL_DATA_ROOT "/home/nick/.local/share/ftl"
#define FTL_GLOBAL_CONFIG_ROOT "install/share/ftl"
#define FTL_GLOBAL_CACHE_ROOT "install/share/ftl"
#define FTL_GLOBAL_DATA_ROOT "install/share/ftl"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment