New release

diff --git a/FULLNAMES b/FULLNAMES
index 1fd1deda444cf6b6e3ea87911d48b4f28f6e4d89..4fb4c5222ee9e3f1b94817964b8dd0b2b3f628b6 100644 (file)
--- a/FULLNAMES
+++ b/FULLNAMES
@@ -1 +1 @@
-Pro line one name
+WeDo 2.0 32bit

diff --git a/Makefile b/Makefile
index 4e4341dd3f4c8ea4ef2e64e870fbae49775134f3..63cf38eb41f634de336f6ecb3c35a49ed155ae1b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ package:
        sed -i s/YEAR/$(YEAR)/g        oss-pkg-$(PACKAGE).spec
        sed    s/VERSION/$(VERSION)/g  init.sls.in > repo-ng/init.sls
        ../oss-pkg-tools/create_hash.sh $(PACKAGE)
        sed -i s/YEAR/$(YEAR)/g        oss-pkg-$(PACKAGE).spec
        sed    s/VERSION/$(VERSION)/g  init.sls.in > repo-ng/init.sls
        ../oss-pkg-tools/create_hash.sh $(PACKAGE)

+       rm -rf oss-pkg-$(PACKAGE)

        mkdir -p oss-pkg-$(PACKAGE)
        sed s/PACKAGE/$(PACKAGE)/g  $(PACKAGE).sls > oss-pkg-$(PACKAGE)/$(PACKAGE).sls
        if [ -d repo-ng ]; then ln -s ../repo-ng/ oss-pkg-$(PACKAGE)/repo-ng; fi
        mkdir -p oss-pkg-$(PACKAGE)
        sed s/PACKAGE/$(PACKAGE)/g  $(PACKAGE).sls > oss-pkg-$(PACKAGE)/$(PACKAGE).sls
        if [ -d repo-ng ]; then ln -s ../repo-ng/ oss-pkg-$(PACKAGE)/repo-ng; fi

diff --git a/RELEASE b/RELEASE
index c227083464fb9af8955c90d2924774ee50abb547..d00491fd7e5bb6fa28c517a0bb32b8b506539d4d 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-0
\ No newline at end of file
+1

diff --git a/VERSION b/VERSION
index 056436d375319ec50dd920778a8711af88ec50fb..71981a8f2d17129e733929c2275ac2412d3f71b0 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION THIS MUST BE ADAPTED
\ No newline at end of file
+1.9.385

diff --git a/init.sls.in b/init.sls.in
index cb2a5b33bd8c6ac3c73b1f37a446b4c43c035818..0ccf7b04bfe563324d174afcef8be35e14dc1a5f 100644 (file)
--- a/init.sls.in
+++ b/init.sls.in
@@ -17,8 +17,8 @@
 
 WeDo2_0:
   'VERSION':
 
 WeDo2_0:
   'VERSION':

-      full_name: 'TOREPLACE'
-      installer: salt://win/repo-ng/WeDo2_0/TOREPLACE.exe
+      full_name: 'WeDo 2.0 32bit'
+      installer: salt://win/repo-ng/WeDo2_0/WeDo2_Full_1.9.385_Global_WIN10.exe

       {% if ARCH == 'x64' %}
       uninstaller: '%PROGRAMFILES(x86)%\WeDo2_0\unins000.exe'
       {% else %}
       {% if ARCH == 'x64' %}
       uninstaller: '%PROGRAMFILES(x86)%\WeDo2_0\unins000.exe'
       {% else %}

diff --git a/repo-ng/HASH.json b/repo-ng/HASH.json
new file mode 100644 (file)
index 0000000..de8b15b
--- /dev/null
+++ b/repo-ng/HASH.json
@@ -0,0 +1 @@
+{"name":"WeDo2_0","manually":false,"description":"WeDo2_0","softwareVersions":[{"version":"1.9.385","status":"C"}],"softwareFullNames":[{"fullName":"WeDo 2.0 32bit"}]}

diff --git a/repo-ng/WeDo2_Full_1.9.385_Global_WIN10.exe b/repo-ng/WeDo2_Full_1.9.385_Global_WIN10.exe
new file mode 100644 (file)
index 0000000..d68a201
Binary files /dev/null and b/repo-ng/WeDo2_Full_1.9.385_Global_WIN10.exe differ

diff --git a/repo-ng/init.sls b/repo-ng/init.sls
new file mode 100644 (file)
index 0000000..0d19865
--- /dev/null
+++ b/repo-ng/init.sls
@@ -0,0 +1,33 @@
+###############################################################################
+# SLS: WeDo2_0
+# Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany.
+# All rights reserved.
+#
+# Authors:               Helmuth Varkoly
+#
+# Description:          Package SLS
+###############################################################################
+{% if grains['cpuarch'] == 'AMD64' %}
+{% set ARCH = "x64" %}
+{% else %}
+{% set ARCH = "x86" %}
+{% endif %}
+
+{% set LOG_PATH = 'C:\\salt\\var\\log' %}
+
+WeDo2_0:
+  '1.9.385':
+      full_name: 'WeDo 2.0 32bit'
+      installer: salt://win/repo-ng/WeDo2_0/WeDo2_Full_1.9.385_Global_WIN10.exe
+      {% if ARCH == 'x64' %}
+      uninstaller: '%PROGRAMFILES(x86)%\WeDo2_0\unins000.exe'
+      {% else %}
+      uninstaller: '%PROGRAMFILES%\WeDo2_0\unins000.exe'      
+      {% endif %}
+      install_flags: '/verysilent /norestart /LOG="{{ LOG_PATH }}_inst.log"'
+      uninstall_flags: '/verysilent /SUPPRESSMSGBOXES /NORESTART /LOG="{{ LOG_PATH }}_uninst.log"'
+      locale: de_DE
+      msiexec: False
+      reboot: False
+      cache_dir: False
+