Merge branch 'release/v1.7.0'

# Conflicts:
#	Build.csproj

Author: EvilBeaver

.github/logo-small.png

@@ -1,24 +1,20 @@
 {
-    "version": "0.1.0",
+    "version": "2.0.0",
     "command": "oscript",
-    "isShellCommand": true,
-    "showOutput": "silent",
     "args": [
         "-encoding=utf-8"
     ],
     "tasks": [
         {
-            "taskName": "Testing project",
+            "label": "Testing project",
+            "type": "shell",
+            "command": "oscript",
             "args": [
+                "-encoding=utf-8",
                 "${workspaceRoot}/tests/testrunner.os",
                 "-runall",
                 "${workspaceRoot}/tests"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            // "isBuildCommand": false,
-            "isTestCommand": false,
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -30,17 +26,15 @@
             }
         },
         {
-            "taskName": "Test current test-file",
+            "label": "Test current test-file",
+            "type": "shell",
+            "command": "oscript",
             "args": [
+                "-encoding=utf-8",
                 "${workspaceRoot}/tests/testrunner.os",
                 "-run",
                 "${file}"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            // "isBuildCommand": false,
-            "isTestCommand": false,
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -52,48 +46,47 @@
             }
         },
         {
-            "taskName": "OneScript: compile",
+            "label": "OneScript: compile",
+            "type": "shell",
+            "command": "oscript",
             "args": [
+                "-encoding=utf-8",
                 "-compile",
                 "${file}"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": false
+            "problemMatcher": []
         },
         {
-            "taskName": "OneScript: check",
+            "label": "OneScript: check",
+            "type": "shell",
+            "command": "oscript",
             "args": [
+                "-encoding=utf-8",
                 "-check",
                 "${file}"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": false
+            "problemMatcher": []
         },
         {
-            "taskName": "OneScript: make",
+            "label": "OneScript: make",
+            "type": "shell",
+            "command": "oscript",
             "args": [
+                "-encoding=utf-8",
                 "-make",
                 "${file}",
                 "${fileBasename}.exe"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": false
+            "problemMatcher": []
         },
         {
-            "taskName": "OneScript: run",
+            "label": "OneScript: run",
+            "type": "shell",
+            "command": "oscript",
             "args": [
+                "-encoding=utf-8",
                 "${file}"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": true,
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -102,7 +95,8 @@
                     "location": 2,
                     "message": 3
                 }
-            }
+            },
+            "group": "build"
         }
     ]
 }

.vscode/tasks.json

@@ -125,7 +125,7 @@
         <CallTarget Targets="InstallStdLib" Condition="'$(StandardLibraryPacks)' != ''"/>
         <DeleteTree Directories="$(LibFolder)/opm" />
 
-        <Exec Command="&quot;$(ToolFolder)/oscript.exe&quot; &quot;$(MSBuildProjectDirectory)\install\unicode-zipper.os&quot; unpack &quot;$(MSBuildProjectDirectory)\install\opm-1.0.2.ospx&quot; &quot;$(LibFolder)\tmp&quot;"/>
+        <Exec Command="&quot;$(ToolFolder)/oscript.exe&quot; &quot;$(MSBuildProjectDirectory)\install\unicode-zipper.os&quot; unpack &quot;$(MSBuildProjectDirectory)\install\opm.ospx&quot; &quot;$(LibFolder)\tmp&quot;"/>
         <Exec Command="&quot;$(ToolFolder)/oscript.exe&quot; &quot;$(MSBuildProjectDirectory)\install\unicode-zipper.os&quot; unpack &quot;$(LibFolder)\tmp\content.zip&quot; &quot;$(LibFolder)/opm&quot;"/>
 
         <Copy SourceFiles="$(MSBuildProjectDirectory)\install\package-loader.os" DestinationFolder="$(LibFolder)"/>

Build.csproj

@@ -4,7 +4,7 @@ pipeline {
     agent none
 
     environment {
-        ReleaseNumber = '1.6.0'
+        ReleaseNumber = '1.7.0'
         outputEnc = '65001'
     }
 
@@ -22,8 +22,18 @@ pipeline {
                             docker login -p $dockerpassword -u $dockeruser
                             docker push oscript/onescript-builder:deb
                             docker push oscript/onescript-builder:rpm
+                            docker push oscript/onescript-builder:gcc
+							
+							# TODO: Немного через жопу собираются .so для NativеApi
+							# при сборке образа, а не при его запуске
+                            docker create --name gcc-$BUILD_NUMBER oscript/onescript-builder:gcc
+                            docker cp gcc-$BUILD_NUMBER:/built .
+                            docker rm gcc-$BUILD_NUMBER
                             """.stripIndent()
                         }
+                        script {
+                            stash includes: 'built/** ', name: 'builtNativeApi'
+                        }
                     }
                 }
 
@@ -119,6 +129,7 @@ pipeline {
                         }
 
                         unstash 'buildResults'
+                        unstash 'builtNativeApi'
 
                         sh '''\
                         if [ ! -d lintests ]; then
@@ -154,6 +165,7 @@ pipeline {
                             }
 
                             unstash 'buildResults'
+                            unstash 'builtNativeApi'
                             script
                             {
                                 if (env.BRANCH_NAME == "preview") {
@@ -180,6 +192,7 @@ pipeline {
 
                     steps {
                         unstash 'buildResults'
+                        unstash 'builtNativeApi'
                         sh '/bld/build.sh'
                         archiveArtifacts artifacts: 'out/deb/*', fingerprint: true
                         stash includes: 'out/deb/*', name: 'debian'
@@ -196,6 +209,7 @@ pipeline {
 
                     steps {
                         unstash 'buildResults'
+                        unstash 'builtNativeApi'
                         sh '/bld/build.sh'
                         archiveArtifacts artifacts: 'out/rpm/*', fingerprint: true
                         stash includes: 'out/rpm/*', name: 'redhat'

Jenkinsfile

@@ -2,6 +2,8 @@
 
 ### The project is an independent cross-platform open-source implementation of a virtual machine that executes scripts written in BSL (1C:Enterprise scripting language).
 
+![Logo](.github/logo-small.png)
+
 Script execution doesn't use any 1C:Enterprise system libraries and doesn't require installation of 1C:Enterprise system on the target machine.
 
 In other words, this is a possibility to write programs in the 1C (BSL) language without using the 1C:Enterprise platform.

README-EN.md

@@ -2,9 +2,10 @@
 
 [![Join telegram chat](https://img.shields.io/badge/chat-telegram-blue?style=flat&logo=telegram)](https://t.me/oscript_library) [![DEV Build Status](https://build.oscript.io/buildStatus/icon?job=1Script%2Fdevelop&style=flat-square&subject=dev)](https://build.oscript.io/job/1Script/job/develop/) [![STABLE Build Status](https://build.oscript.io/buildStatus/icon?job=1Script%2Fmaster&style=flat-square&subject=stable)](https://build.oscript.io/job/1Script/job/master/)
 
-
 ## Проект является независимой кросс-платформенной реализацией виртуальной машины, исполняющей скрипты на языке 1С:Предприятие ##
 
+![Logo](.github/logo-small.png)
+
 При этом библиотеки системы 1С:Предприятие не используются и не требуется установка системы 1С:Предприятие на целевой машине.
 
 Иными словами, это инструмент для написания и выполнения программ на языке 1С без использования платформы 1С:Предприятие.

README.md

@@ -1,5 +1,4 @@
 FROM ubuntu:16.04
-MAINTAINER [email protected]
 
 
 RUN apt-get update && apt-get install -y \

install/builders/deb/Dockerfile

@@ -27,6 +27,7 @@ cp ${BUILDERROOT}settings/dirs $DSTPATH/DEBIAN/
 cat ${BUILDERROOT}settings/control | sed -r "s/VERSION/$VERSION/g" > $DSTPATH/DEBIAN/control
 cp ${BINPATH}*.exe $DSTPATH/usr/share/oscript/bin
 cp ${BINPATH}*.dll $DSTPATH/usr/share/oscript/bin
+cp ${BINPATH}*.so $DSTPATH/usr/share/oscript/bin
 cp ${BUILDERROOT}oscript $DSTPATH/usr/bin
 cp ${BUILDERROOT}oscript-cgi $DSTPATH/usr/bin
 cp ${BUILDERROOT}oscript-opm $DSTPATH/usr/bin

install/builders/deb/build.sh

@@ -0,0 +1,22 @@
+FROM ubuntu:18.04
+
+RUN apt-get update -qq \
+    && dpkg --add-architecture i386 \
+    && apt-get install -y -qq build-essential cmake uuid-dev libc6-dev gcc-multilib g++-multilib
+
+WORKDIR /src/proxy
+COPY /src/ScriptEngine.NativeApi /src/proxy
+RUN chmod +x build.sh && ./build.sh
+
+WORKDIR /src/tests
+COPY /tests/native-api /src/tests
+RUN chmod +x build.sh && ./build.sh
+
+RUN cd / \
+    && mkdir built \
+    && mkdir built/tmp \
+    && mkdir built/tmp/bin \
+    && mkdir built/tmp/tests \
+    && cp /src/proxy/*.so built/tmp/bin \
+    && cp /src/tests/*.so built/tmp/tests \
+    && chmod -x built/tmp/bin/*.so

install/builders/nativeapi/Dockerfile

@@ -1,5 +1,4 @@
 FROM fedora:26
-MAINTAINER Chmouel Boudjnah <[email protected]>
 
 
 # Install various packages to get compile environment