+++ /dev/null
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
- <PropertyGroup Condition=" '$(UsingRPMMacro)' == 'true' ">
-
- <!-- DocumentationFile -->
- <NoWarn>$(NoWarn);1591</NoWarn>
- <DocumentationFile Condition="'$(DocumentationFile)' == ''">$(OutputPath)$(AssemblyName).xml</DocumentationFile>
-
- </PropertyGroup>
-
-</Project>
+++ /dev/null
-#!/bin/bash
-
-DOTNET_CLI_PATH=/usr/share/dotnet-build-tools/cli/dotnet
-
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
-export DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX=2
-export MSBUILDDISABLENODEREUSE=true
-
-$DOTNET_CLI_PATH "$@" /nodeReuse:false /p:UseRazorBuildServer=false /p:UseSharedCompilation=false
+++ /dev/null
-#!/bin/sh
-
-# Execute a command with a timeout
-
-# License: LGPLv2
-# Author:
-# http://www.pixelbeat.org/
-# Notes:
-# Note there is a timeout command packaged with coreutils since v7.0
-# If the timeout occurs the exit status is 124.
-# There is an asynchronous (and buggy) equivalent of this
-# script packaged with bash (under /usr/share/doc/ in my distro),
-# which I only noticed after writing this.
-# I noticed later again that there is a C equivalent of this packaged
-# with satan by Wietse Venema, and copied to forensics by Dan Farmer.
-# Changes:
-# V1.0, Nov 3 2006, Initial release
-# V1.1, Nov 20 2007, Brad Greenlee <brad@footle.org>
-# Make more portable by using the 'CHLD'
-# signal spec rather than 17.
-# V1.3, Oct 29 2009, Ján Sáreník <jasan@x31.com>
-# Even though this runs under dash,ksh etc.
-# it doesn't actually timeout. So enforce bash for now.
-# Also change exit on timeout from 128 to 124
-# to match coreutils.
-# V2.0, Oct 30 2009, Ján Sáreník <jasan@x31.com>
-# Rewritten to cover compatibility with other
-# Bourne shell implementations (pdksh, dash)
-
-if [ "$#" -lt "2" ]; then
- echo "Usage: `basename $0` timeout_in_seconds command" >&2
- echo "Example: `basename $0` 2 sleep 3 || echo timeout" >&2
- exit 1
-fi
-
-cleanup()
-{
- trap - ALRM #reset handler to default
- kill -ALRM $a 2>/dev/null #stop timer subshell if running
- kill $! 2>/dev/null && #kill last job
- exit 124 #exit with 124 if it was running
-}
-
-watchit()
-{
- trap "cleanup" ALRM
- sleep $1& wait
- kill -ALRM $$
-}
-
-watchit $1& a=$! #start the timeout
-shift #first param was timeout for sleep
-trap "cleanup" ALRM INT #cleanup after timeout
-"$@"& wait $!; RET=$? #start the job wait for it and save its return value
-kill -ALRM $a #send ALRM signal to watchit
-wait $a #wait for watchit to finish cleanup
-exit $RET #return the value
-
Requires: corefx-managed-ref
Requires: libicu
Requires: openssl1.1
+Requires: make
+Requires: dotnet-launcher-gbs-support
%description
Provides dotnet-sdk for GBS environment
%define TOOLS_PATH /usr/share/dotnet-build-tools
-%define CLI_PATH %{TOOLS_PATH}/cli
+%define SDK_PATH %{TOOLS_PATH}/sdk
%prep
%setup -q
tar xvfz %{SOURCE22} -C dotnet/deps
%build
-# Prepare dotnet-cli
+# Prepare dotnet-sdk
%ifnarch x86_64
for file in $( find ./dotnet -name "dotnet" -type f )
do
- patchelf --set-interpreter %{CLI_PATH}/deps/ld-linux-x86-64.so.2 ${file}
- patchelf --set-rpath %{CLI_PATH}/deps/ ${file}
+ patchelf --set-interpreter %{SDK_PATH}/deps/ld-linux-x86-64.so.2 ${file}
+ patchelf --set-rpath %{SDK_PATH}/deps/ ${file}
done
for file in $( find ./dotnet -type f \( -name "*.so" -or -name "*.so.*" \) -not -name "*.dbg" -not -name "ld-*.so*" )
do
- patchelf --set-rpath %{CLI_PATH}/deps/ ${file}
+ patchelf --set-rpath %{SDK_PATH}/deps/ ${file}
done
%endif
%install
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{SDK_PATH}
+
# RPM Macros
install -D -p -m 0644 %{S:1} %{buildroot}%{_sysconfdir}/rpm/macros.dotnet-build-tools
+# .NETCore SDK
+cp -fr ./dotnet/* %{buildroot}%{SDK_PATH}
+
# BuildTools
-mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{TOOLS_PATH}
-install -p -m 755 Tools/* %{buildroot}%{TOOLS_PATH}
+cp -fr ./tools/* %{buildroot}%{TOOLS_PATH}
ln -s %{TOOLS_PATH}/dotnet-build.sh %{buildroot}%{_bindir}/dotnet-build
-
-# .NETCore SDK
-mkdir -p %{buildroot}%{CLI_PATH}
-cp -fr ./dotnet/* %{buildroot}%{CLI_PATH}
ln -s %{TOOLS_PATH}/dotnet-wrapper.sh %{buildroot}%{_bindir}/dotnet
-
-# Tizen.GBS.BuildTasks
-install -p -m 644 Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets %{buildroot}%{CLI_PATH}/sdk/*/Current/Microsoft.Common.targets/ImportAfter
+ln -s %{TOOLS_PATH}/dotnet-validate-struct.sh %{buildroot}%{_bindir}/dotnet-validate-struct
%files
%config(noreplace) %{_sysconfdir}/rpm/macros.dotnet-build-tools
--- /dev/null
+{
+ "runtimeTarget": {
+ "name": ".NETCoreApp,Version=v3.0",
+ "signature": ""
+ },
+ "compilationOptions": {},
+ "targets": {
+ ".NETCoreApp,Version=v3.0": {
+ "StructValidator/1.0.0": {
+ "runtime": {
+ "StructValidator.dll": {}
+ }
+ }
+ }
+ },
+ "libraries": {
+ "StructValidator/1.0.0": {
+ "type": "project",
+ "serviceable": false,
+ "sha512": ""
+ }
+ }
+}
\ No newline at end of file
--- /dev/null
+{
+ "runtimeOptions": {
+ "tfm": "netcoreapp3.0",
+ "framework": {
+ "name": "Microsoft.NETCore.App",
+ "version": "3.0.0"
+ }
+ }
+}
\ No newline at end of file
--- /dev/null
+MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
+MKFILE_DIR := $(dir $(MKFILE_PATH))
+
+BINDIR := $(MKFILE_DIR)
+TARGET ?= $(MKFILE_DIR)/structcheck
+
+CC := gcc
+
+SRCS = $(wildcard $(MKFILE_DIR)/*.c)
+INCS = $(wildcard $(MKFILE_DIR)/*.h)
+OBJS = $(patsubst %.c,%.o,$(SRCS))
+
+include auto-generated.mk
+
+PKGCONFIG = $(if $(strip $(DEPS)), `pkg-config --cflags $(DEPS)`,)
+
+CFLAGS += -fPIC -I$(MKFILE_DIR) $(PKGCONFIG)
+LDFLAGS +=
+
+$(TARGET): $(OBJS)
+ @mkdir -p $(BINDIR)
+ $(CC) -o $@ $^ $(LDFLAGS)
+
+%.o: %.c $(INCS)
+ $(CC) -c -o $@ $< $(CFLAGS)
+
+.PHONY: clean
+clean:
+ @rm -f $(TARGET)
+ @find $(MKFILE_DIR) -type f -name '*.o' -delete
+ @rm -f auto-generated.c
+ @rm -f auto-generated.mk
+
--- /dev/null
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define PV_CONCAT(x, y) _PV_CONCAT(x, y)
+#define _PV_CONCAT(x, y) x##y
+
+#define CHECK_STRUCT(N, S, T) _CHECK_STRUCT(N, S, T, PV_CONCAT(__fn_, __COUNTER__))
+#define _CHECK_STRUCT(N, S, T, F) __CHECK_STRUCT(N, S, T, F)
+#define __CHECK_STRUCT(N, S, T, F) \
+ static int F(void); \
+ static void __attribute__((constructor)) __construct_##F(void) \
+ { \
+ _add_function_to_provider_list(F); \
+ } \
+ static int F(void) \
+ { \
+ return _check_struct(N, S, sizeof(T)); \
+ }
+
+void _add_function_to_provider_list(int (*f)(void));
+int _check_struct(const char *name, int managed, int unmanaged);
--- /dev/null
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+typedef struct __provider_list_node
+{
+ struct __provider_list_node *next;
+ int (*func)(void);
+} _provider_list_node;
+
+_provider_list_node *_provider_list_head = NULL;
+
+void _add_function_to_provider_list(int (*f)(void))
+{
+ _provider_list_node *node = (_provider_list_node *)malloc(sizeof(_provider_list_node));
+ node->func = f;
+ node->next = _provider_list_head;
+ _provider_list_head = node;
+}
+
+int _check_struct(const char *name, int managed, int unmanaged)
+{
+ if (managed != unmanaged)
+ {
+ printf("* %s size is mismatch. managed(%d) != unmanaged(%d)\n", name, managed, unmanaged);
+ return 0;
+ }
+ return 1;
+}
+
+int main(int argc, char **argv)
+{
+ int valid = 1;
+ _provider_list_node *node = _provider_list_head;
+ while (node != NULL)
+ {
+ valid = valid & node->func();
+ node = node->next;
+ }
+ if (!valid)
+ {
+ printf("***** INVALID STRUCT SIZE *****\n");
+ return 1;
+ }
+ return 0;
+}
run_dotnet() {
echo "+ dotnet $@"
- $RETRY_CMD $TIMEOUT_CMD 600 dotnet $@ /nologo
+ $RETRY_CMD $TIMEOUT_CMD -t 600 dotnet $@ /nologo
exit_on_error $?
}
cmd_restore # restore first
local OPTS=""
[ -n "$CONFIGURATION" ] && OPTS="$OPTS -c $CONFIGURATION"
- run_dotnet build --no-restore $PROJECT $OPTS $@ /p:UsingRPMMacro=true
+ run_dotnet build --no-restore $PROJECT $OPTS $@ /p:GenerateDocumentationFile=True
}
cmd_pack() {
PROJECT=$TMPDIR/dummypack.csproj
run_dotnet restore $PROJECT -s /nuget/
fi
- run_dotnet pack --no-build --no-restore $PRE_OPTS $PROJECT $OPTS $@ /p:UsingRPMMacro=true
+ run_dotnet pack --no-build --no-restore $PRE_OPTS $PROJECT $OPTS $@
}
cmd_install() {
--- /dev/null
+#!/bin/bash -e
+
+SV_ASSEMBLY=/usr/share/dotnet-build-tools/StructValidator/StructValidator.dll
+dotnet-corerun $SV_ASSEMBLY $1
--- /dev/null
+#!/bin/bash
+
+DOTNET_CLI_PATH=/usr/share/dotnet-build-tools/sdk/dotnet
+
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
+export DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX=2
+export MSBUILDDISABLENODEREUSE=true
+
+if [ "$1" == "msbuild" -o "$1" == "build" -o "$1" == "restore" ]; then
+ echo $DOTNET_CLI_PATH "$@" /nodeReuse:false /p:UseRazorBuildServer=false /p:UseSharedCompilation=false
+ $DOTNET_CLI_PATH "$@" /nodeReuse:false /p:UseRazorBuildServer=false /p:UseSharedCompilation=false
+else
+ echo $DOTNET_CLI_PATH "$@"
+ $DOTNET_CLI_PATH "$@"
+fi
--- /dev/null
+#!/bin/bash
+#
+# The Bash shell script executes a command with a time-out.
+# Upon time-out expiration SIGTERM (15) is sent to the process. If the signal
+# is blocked, then the subsequent SIGKILL (9) terminates it.
+#
+# Based on the Bash documentation example.
+
+# Hello Chet,
+# please find attached a "little easier" :-) to comprehend
+# time-out example. If you find it suitable, feel free to include
+# anywhere: the very same logic as in the original examples/scripts, a
+# little more transparent implementation to my taste.
+#
+# Dmitry V Golovashkin <Dmitry.Golovashkin@sas.com>
+
+scriptName="${0##*/}"
+
+declare -i DEFAULT_TIMEOUT=9
+declare -i DEFAULT_INTERVAL=1
+declare -i DEFAULT_DELAY=1
+
+# Timeout.
+declare -i timeout=DEFAULT_TIMEOUT
+# Interval between checks if the process is still alive.
+declare -i interval=DEFAULT_INTERVAL
+# Delay between posting the SIGTERM signal and destroying the process by SIGKILL.
+declare -i delay=DEFAULT_DELAY
+
+function printUsage() {
+ cat <<EOF
+
+Synopsis
+ $scriptName [-t timeout] [-i interval] [-d delay] command
+ Execute a command with a time-out.
+ Upon time-out expiration SIGTERM (15) is sent to the process. If SIGTERM
+ signal is blocked, then the subsequent SIGKILL (9) terminates it.
+
+ -t timeout
+ Number of seconds to wait for command completion.
+ Default value: $DEFAULT_TIMEOUT seconds.
+
+ -i interval
+ Interval between checks if the process is still alive.
+ Positive integer, default value: $DEFAULT_INTERVAL seconds.
+
+ -d delay
+ Delay between posting the SIGTERM signal and destroying the
+ process by SIGKILL. Default value: $DEFAULT_DELAY seconds.
+
+As of today, Bash does not support floating point arithmetic (sleep does),
+therefore all delay/time values must be integers.
+EOF
+}
+
+# Options.
+while getopts ":t:i:d:" option; do
+ case "$option" in
+ t) timeout=$OPTARG ;;
+ i) interval=$OPTARG ;;
+ d) delay=$OPTARG ;;
+ *) printUsage; exit 1 ;;
+ esac
+done
+shift $((OPTIND - 1))
+
+# $# should be at least 1 (the command to execute), however it may be strictly
+# greater than 1 if the command itself has options.
+if (($# == 0 || interval <= 0)); then
+ printUsage
+ exit 1
+fi
+
+# kill -0 pid Exit code indicates if a signal may be sent to $pid process.
+(
+ ((t = timeout))
+
+ while ((t > 0)); do
+ sleep $interval
+ kill -0 $$ || exit 0
+ ((t -= interval))
+ done
+
+ # Be nice, post SIGTERM first.
+ # The 'exit 0' below will be executed if any preceeding command fails.
+ kill -s SIGTERM $$ && kill -0 $$ || exit 0
+ sleep $delay
+ kill -s SIGKILL $$
+) 2> /dev/null &
+
+exec "$@"
--- /dev/null
+#!/bin/bash
+
+SCRIPT_FILE=$(readlink -f $0)
+SCRIPT_DIR=$(dirname $SCRIPT_FILE)
+
+SV_GITDIR="$SCRIPT_DIR/.repos/StructValidator"
+SV_BINDIR="$SCRIPT_DIR/tools/StructValidator"
+
+rm -fr $SV_GITDIR
+git clone https://github.sec.samsung.net/dotnet/StructValidator $SV_GITDIR
+dotnet publish $SV_GITDIR -o $SV_BINDIR
+
+rm -fr $SV_GITDIR
+
projects / platform / core / dotnet / build-tools.git / commitdiff