Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ifs
sconsider
Commits
5ee49365
Commit
5ee49365
authored
Nov 09, 2020
by
Marcel Huber
Browse files
extended hello test with included header file
parent
38253be0
Changes
3
Hide whitespace changes
Inline
Side-by-side
tests/invocation/staticprog/progdir/hello.cpp
View file @
5ee49365
#include "hello.h"
#include <iostream>
#include <vector>
#include <string>
...
...
tests/invocation/staticprog/progdir/hello.h
0 → 100644
View file @
5ee49365
#ifndef _HELLO_H
#define _HELLO_H
struct
dummy
{
int
aValue
;
};
#endif
/* _HELLO_H */
tests/invocation/staticprog/progdir/hello.sconsider
View file @
5ee49365
...
...
@@ -12,14 +12,22 @@
import pkg_resources
pkg_resources.require(["SConsider"])
import os
import tempfile
from socket import gethostbyname
from tempfile import gettempdir
from stat import *
from SomeUtils import
listFiles
from SomeUtils import
findFiles, listFiles, getfqdn
Import('*')
searchReplace = {
'TMPDIR': lambda env: tempfile.gettempdir() if str(env['PLATFORM']) in ['cygwin', 'win32'] else '/tmp',
configdir = 'config'
hostname, domain, fqdn = getfqdn()
searchReplaceDict = {
'FQDN': fqdn,
'HOSTNAME': hostname,
'HOSTNAMEIP': gethostbyname(hostname),
'DOMAINONLY': domain,
'TMPDIR': lambda env: gettempdir() if str(env['PLATFORM']) in ['cygwin', 'win32'] else '/tmp',
}
...
...
@@ -33,8 +41,10 @@ def tearDown(target, source, env):
programDepends = []
sourceFiles = ['hello.cpp']
includeSubdir = '.'
exportIncludes = listFiles([os.path.join(includeSubdir, '*.h')])
copyFiles = [
(listFiles([
'config/
*.any']), S_IRUSR | S_IRGRP | S_IROTH, searchReplace),
(listFiles([
os.path.join(configdir, '
*.any'
)
]), S_IRUSR | S_IRGRP | S_IROTH, searchReplace
Dict
),
]
bin_name = 'hello'
runConfigRunner = {
...
...
@@ -52,6 +62,11 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
'sourceFiles': sourceFiles,
'targetType': 'Program',
'targetName': bin_name,
'includeSubdir': includeSubdir,
'public': {
'includeSubdir': includeSubdir,
'includes': exportIncludes,
}
},
'runner': {
'targetType': 'ProgramApp',
...
...
@@ -71,7 +86,16 @@ elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
def setRelTargetDir(env, prefix='apps'):
env.setRelativeTargetDirectory(os.path.join(prefix, packagename))
bin_target = createPackageProgram(packagename, bin_name, sourceFiles, pkg_local=[setRelTargetDir])
# create own library
includeTarget = EnvBuilder(
export=[EnvBuilder().include(Dir(includeSubdir))]).build().RegisterPackageTarget(
packagename=packagename, targetname='include')
bin_target = createPackageProgram(packagename,
bin_name,
sourceFiles,
depend=[includeTarget],
pkg_local=[setRelTargetDir])
copyTarget = createCopyFilesTarget(packagename,
'configfiles',
...
...
@@ -93,5 +117,6 @@ elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
createAlias('binaries', runner_target)
EnvBuilder().depend(bin_target, script_target).build().RegisterPackageTarget(packagename=packagename,
targetname=packagename)
EnvBuilder().depend(includeTarget, bin_target,
script_target).build().RegisterPackageTarget(packagename=packagename,
targetname=packagename)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment