Merge pull request #1822 from ZiminGrigory/version

CHANGED: packages.xml for 3.2.0
qreal · Nov 14, 2017 · 0245401 · 0245401
2 parents 2475f17 + 0461432
commit 0245401
Show file tree

Hide file tree

Showing 27 changed files with 50 additions and 50 deletions.
diff --git a/installer/packages/qreal-base/ru.qreal.root.desktop_shortcut/meta/package.xml b/installer/packages/qreal-base/ru.qreal.root.desktop_shortcut/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>Desktop shortcut</DisplayName>
     <DisplayName xml:lang="ru_ru">Ярлык на рабочем столе</DisplayName>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <Script>installscript.qs</Script>
     <SortingPriority>7</SortingPriority>
     <Default>true</Default>

diff --git a/installer/packages/qreal-base/ru.qreal.root.languages.french/meta/package.xml b/installer/packages/qreal-base/ru.qreal.root.languages.french/meta/package.xml
@@ -3,8 +3,8 @@
     <DisplayName>French</DisplayName>
     <DisplayName xml:lang="ru_ru">Français</DisplayName>
     <DisplayName xml:lang="fr_fr">Français</DisplayName>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>8</SortingPriority>
     <Default>true</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/qreal-base/ru.qreal.root.languages.russian/meta/package.xml b/installer/packages/qreal-base/ru.qreal.root.languages.russian/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>Russian</DisplayName>
     <DisplayName xml:lang="ru_ru">Русский</DisplayName>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>8</SortingPriority>
     <Default>true</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/qreal-base/ru.qreal.root.languages/meta/package.xml b/installer/packages/qreal-base/ru.qreal.root.languages/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>Languages</DisplayName>
     <DisplayName xml:lang="ru_ru">Языки</DisplayName>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>9</SortingPriority>
     <ForcedInstallation>false</ForcedInstallation>
 </Package>
diff --git a/installer/packages/qreal-base/ru.qreal.root/meta/package.xml b/installer/packages/qreal-base/ru.qreal.root/meta/package.xml
@@ -4,8 +4,8 @@
     <DisplayName xml:lang="ru_ru">@ProductName@</DisplayName>
     <Description>QReal metacase tool engine</Description>
     <Description xml:lang="ru_ru">Ядро системы визуального метамоделирования QReal</Description>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <Script>installscript.qs</Script>
     <Licenses>
          <!-- TODO: find all russian license texts -->

diff --git a/installer/packages/trik-studio/ru.qreal.root.ev3.examples/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.ev3.examples/meta/package.xml
@@ -4,8 +4,8 @@
     <DisplayName xml:lang="ru_ru">Примеры</DisplayName>
     <Description>A set of examples for Lego EV3 kit</Description>
     <Description xml:lang="ru_ru">Набор примеров программ для Lego EV3</Description>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>8</SortingPriority>
     <Default>true</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.ev3/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.ev3/meta/package.xml
@@ -4,8 +4,8 @@
     <DisplayName xml:lang="ru_ru">Поддержка Lego EV3</DisplayName>
     <Description>Install it for working with Lego EV3 in TRIK Studio</Description>
     <Description xml:lang="ru_ru">Установите это для работы с конструктором Lego EV3</Description>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <Licenses>
         <License name="QextSerialPort Component License" file="QextSerialPort-license.txt" />
     </Licenses>

diff --git a/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/package.xml
@@ -4,8 +4,8 @@
     <DisplayName xml:lang="ru_ru">Обязательные файлы</DisplayName>
     <Description>Enables support of Lego NXT in TRIK Studio</Description>
     <Description xml:lang="ru_ru">Поддержка конструктора Lego NXT</Description>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <Licenses>
         <License name="QextSerialPort Component License" file="QextSerialPort-license.txt" />
     </Licenses>

diff --git a/installer/packages/trik-studio/ru.qreal.root.nxt.examples/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.nxt.examples/meta/package.xml
@@ -4,8 +4,8 @@
     <DisplayName xml:lang="ru_ru">Примеры</DisplayName>
     <Description>A set of examples for Lego NXT kit</Description>
     <Description xml:lang="ru_ru">Набор примеров программ для Lego NXT</Description>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>8</SortingPriority>
     <Default>true</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.nxt.tools/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.nxt.tools/meta/package.xml
@@ -4,8 +4,8 @@
     <DisplayName xml:lang="ru_ru">Инструменты NXT</DisplayName>
     <Description>Install it for uploading programs to Lego NXT device</Description>
     <Description xml:lang="ru_ru">Установите это для возможности загрузки программ на робота Lego NXT</Description>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <Licenses>
         <!-- TODO -->
     </Licenses>

diff --git a/installer/packages/trik-studio/ru.qreal.root.nxt/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.nxt/meta/package.xml
@@ -4,8 +4,8 @@
     <DisplayName xml:lang="ru_ru">Поддержка Lego NXT</DisplayName>
     <Description>Packages for working with Lego NXT in TRIK Studio</Description>
     <Description xml:lang="ru_ru">Пакеты для работы с конструктором Lego NXT</Description>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>18</SortingPriority>
     <ForcedInstallation>false</ForcedInstallation>
 </Package>
diff --git a/installer/packages/trik-studio/ru.qreal.root.pioneer.examples/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.pioneer.examples/meta/package.xml
@@ -5,7 +5,7 @@
     <Description>A set of examples for Pioneer quadcopter</Description>
     <Description xml:lang="ru_ru">Набор примеров программ для квадрокоптера "Пионер"</Description>
     <Version>3.2.0-4</Version>
-    <ReleaseDate>2017-06-12</ReleaseDate>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>8</SortingPriority>
     <Default>false</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.pioneer/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.pioneer/meta/package.xml
@@ -5,7 +5,7 @@
     <Description>Install it for working with Pioneer quadcopter in TRIK Studio</Description>
     <Description xml:lang="ru_ru">Установите это для программирования квадрокоптера "Пионер"</Description>
     <Version>3.2.0-4</Version>
-    <ReleaseDate>2017-06-11</ReleaseDate>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>17</SortingPriority>
     <Default>false</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.trik.core.v6/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.trik.core.v6/meta/package.xml
@@ -4,8 +4,8 @@
     <DisplayName xml:lang="ru_ru">Поддержка ТРИК (старый корпус)</DisplayName>
     <Description>Enables support of TRIK in TRIK Studio</Description>
     <Description xml:lang="ru_ru">Поддержка конструктора ТРИК (новый корпус, с портами энкодеров B1 - B4)</Description>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>10</SortingPriority>
     <Default>false</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.trik.core.v62/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.trik.core.v62/meta/package.xml
@@ -4,8 +4,8 @@
     <DisplayName xml:lang="ru_ru">Поддержка ТРИК (новый корпус)</DisplayName>
     <Description>Enables support of TRIK (new case) in TRIK Studio</Description>
     <Description xml:lang="ru_ru">Поддержка конструктора ТРИК (новый корпус, с портами энкодеров E1 - E4)</Description>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>10</SortingPriority>
     <Default>true</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/package.xml
@@ -4,8 +4,8 @@
     <DisplayName xml:lang="ru_ru">Поддержка ТРИК</DisplayName>
     <Description>Enables support of TRIK in TRIK Studio</Description>
     <Description xml:lang="ru_ru">Поддержка конструктора ТРИК</Description>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <Licenses>
         <License name="WinScp Component License" file="WinScp-license.txt" />
     </Licenses>

diff --git a/installer/packages/trik-studio/ru.qreal.root.trik.examples/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.trik.examples/meta/package.xml
@@ -4,8 +4,8 @@
     <DisplayName xml:lang="ru_ru">Примеры</DisplayName>
     <Description>A set of examples for TRIK kit</Description>
     <Description xml:lang="ru_ru">Набор примеров программ для ТРИК</Description>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>9</SortingPriority>
     <Default>true</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.trik.f_sharp.v6/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.trik.f_sharp.v6/meta/package.xml
@@ -5,8 +5,8 @@
     <Description>Install it for generation of F# code for TRIK</Description>
     <Description xml:lang="ru_ru">Установите это для генерации кода на F# для конструктора ТРИК (старый корпус, с портами энкодеров B1 - B4)</Description>
     <Dependencies>ru.qreal.root.trik.core.v6</Dependencies>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>5</SortingPriority>
     <Default>false</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.trik.f_sharp.v62/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.trik.f_sharp.v62/meta/package.xml
@@ -5,8 +5,8 @@
     <Description>Install it for generation of F# code for TRIK</Description>
     <Description xml:lang="ru_ru">Установите это для генерации кода на F# для конструктора ТРИК (новый корпус, с портами энкодеров E1 - E4)</Description>
     <Dependencies>ru.qreal.root.trik.core.v62</Dependencies>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>5</SortingPriority>
     <Default>false</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.trik.f_sharp/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.trik.f_sharp/meta/package.xml
@@ -5,8 +5,8 @@
     <Description>Install it for working with TRIK in TRIK Studio</Description>
     <Description xml:lang="ru_ru">Установите это и хотя бы один из компонентов ниже для работы с конструктором ТРИК на языке F#</Description>
     <Dependencies>ru.qreal.root.trik.core</Dependencies>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>5</SortingPriority>
     <Default>false</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.trik.gamepad/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.trik.gamepad/meta/package.xml
@@ -4,8 +4,8 @@
     <DisplayName xml:lang="ru_ru">Пультик для ТРИК</DisplayName>
     <Description>Simple desktop gamepad for TRIK</Description>
     <Description xml:lang="ru_ru">Простой пультик для ТРИК</Description>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>3</SortingPriority>
     <Default>true</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.trik.pascal/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.trik.pascal/meta/package.xml
@@ -5,8 +5,8 @@
     <Description>Install it for working with Pascal (PascalABC.NET dialect) in TRIK Studio</Description>
     <Description xml:lang="ru_ru">Установите это для работы с конструктором ТРИК на языке Паскаль (с помощью PascalABC.NET, который надо установить отдельно)</Description>
     <Dependencies>ru.qreal.root.trik.core</Dependencies>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>5</SortingPriority>
     <Default>true</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.trik.python/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.trik.python/meta/package.xml
@@ -5,8 +5,8 @@
     <Description>Install it for Python support in TRIK Studio</Description>
     <Description xml:lang="ru_ru">Установите это для работы с конструктором ТРИК на языке Питон(Python)</Description>
     <Dependencies>ru.qreal.root.trik.core</Dependencies>
-    <Version>3.2.0-1</Version>
-    <ReleaseDate>2017-02-01</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>5</SortingPriority>
     <Default>false</Default>
     <ForcedInstallation>false</ForcedInstallation>

diff --git a/installer/packages/trik-studio/ru.qreal.root.trik/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.trik/meta/package.xml
@@ -4,8 +4,8 @@
     <DisplayName xml:lang="ru_ru">Поддержка ТРИК</DisplayName>
     <Description>Packages for working with TRIK in TRIK Studio</Description>
     <Description xml:lang="ru_ru">Пакеты для работы с конструктором ТРИК</Description>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <SortingPriority>19</SortingPriority>
     <ForcedInstallation>false</ForcedInstallation>
 </Package>
diff --git a/installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/package.xml b/installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/package.xml
@@ -4,8 +4,8 @@
     <DisplayName xml:lang="ru_ru">Компоненты ядра</DisplayName>
     <Description>TRIK Studio engine, must be installed</Description>
     <Description xml:lang="ru_ru">Ядро системы TRIK Studio, обязательно к установке</Description>
-    <Version>3.1.4-4</Version>
-    <ReleaseDate>2016-06-07</ReleaseDate>
+    <Version>3.2.0-4</Version>
+    <ReleaseDate>2017-11-14</ReleaseDate>
     <Licenses/>
     <SortingPriority>20</SortingPriority>
     <ForcedInstallation>true</ForcedInstallation>

diff --git a/plugins/robots/editor/doc/help/version.js b/plugins/robots/editor/doc/help/version.js
@@ -1,4 +1,4 @@
-var version = "3.2.0-β";
+var version = "3.2.0";
 var year = 2017;
 
 window.onload = function() {

diff --git a/plugins/robots/interpreters/interpreterCore/src/customizer.cpp b/plugins/robots/interpreters/interpreterCore/src/customizer.cpp
@@ -39,7 +39,7 @@ QImage Customizer::applicationLogo() const
 QString Customizer::productVersion() const
 {
 	/// @todo other storage for it?
-	return "3.2.0-β";
+	return "3.2.0";
 }
 
 QString Customizer::aboutText() const