Update logo and name

Hardella · Jun 11, 2016 · 0b4048a · 0b4048a
1 parent 338c548
commit 0b4048a
Show file tree

Hide file tree

Showing 37 changed files with 23,673 additions and 167 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,13 @@
-IDE for ST 61131
-================
+<img src="icons/logo_with_text_436x206.png" width="218" height="103" alt="Hardella IDE logo"/>
+
+Hardella: IDE for PLC
+=====================
 
 About
 -----
-This is an MPS-based IDE for IEC61131-3.
-The main aim is to provide reasonable ST support.
+Hardella is an IDE for programmable logic controllers (PLC).
+The main aim is to provide reasonable ST (61131-3) support (autocomplete, refactoring, etc).
+The IDE is based on [JetBrains MPS](https://www.jetbrains.com/mps/) and [mbeddr](http://mbeddr.com/).
 
 Usage
 -----
@@ -25,14 +28,20 @@ Videos
 - Rename variable: http://recordit.co/g1qQlwj1Co
 - CFC diagram: http://recordit.co/2Itr7umnlo
 
-Sample
-------
+Samples
+-------
+
+#### Autocomplete menu
 
-![Autocomplete](/doc/autocomplete.png)
+<img src="/doc/autocomplete.png" alt="autocomplete" width="537" height="103">
 
-![Diagram editor](/doc/cfc_sample.png)
+#### Diagram editor
 
-![sample program](/doc/sample_program.png)
+<img src="/doc/cfc_sample.png" alt="diagram editor" width="750" height="460">
+
+#### Sample ST program
+
+<img src="/doc/sample_program.png" alt="sample ST program" width="371" height="412">
 
 ```
 PROGRAM PLC_PRG
@@ -70,6 +79,9 @@ Install mbeddr, clone ide61131, hack as required.
 Changelog
 ---------
 
+v1.4.0: 12 June 2016
+- New project name and logo
+
 v1.3.0: 30 April 2016
 - New project wizard: https://youtu.be/zCULGT3yZwA
 

diff --git a/bin/mac/Contents/Info.plist b/bin/mac/Contents/Info.plist
@@ -0,0 +1,113 @@
+<!DOCTYPE plist PUBLIC '-//Apple Computer//DTD PLIST 1.0//EN' 'http://www.apple.com/DTDs/PropertyList-1.0.dtd'>
+<plist version="1.0">
+  <!--Generated by MPS-->
+  <dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleDocumentTypes</key>
+    <array>
+      <dict>
+        <key>CFBundleTypeExtensions</key>
+        <array>
+          <string>mpr</string>
+        </array>
+        <key>CFBundleTypeIconFile</key>
+        <string>mps.icns</string>
+        <key>CFBundleTypeName</key>
+        <string>Hardella IDE Project</string>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+      </dict>
+      <dict>
+        <key>CFBundleTypeExtensions</key>
+        <array>
+          <string>*</string>
+        </array>
+        <key>CFBundleTypeName</key>
+        <string>All documents</string>
+        <key>CFBundleTypeOSTypes</key>
+        <array>
+          <string>****</string>
+        </array>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>LSTypeIsPackage</key>
+        <false />
+      </dict>
+    </array>
+    <key>CFBundleExecutable</key>
+    <string>mps</string>
+    <key>CFBundleIconFile</key>
+    <string>mps.icns</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>Hardella</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.github.vlsi</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleGetInfoString</key>
+    <string>@CFBundleGetInfoString@</string>
+    <key>CFBundleShortVersionString</key>
+    <string>@CFBundleShortVersionString@</string>
+    <key>CFBundleVersion</key>
+    <string>@CFBundleVersion@</string>
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.developer-tools</string>
+
+    <key>NSHighResolutionCapable</key>
+    <true />
+    <key>LSArchitecturePriority</key>
+    <array>
+      <string>x86_64</string>
+      <string>i386</string>
+    </array>
+    <key>LSRequiresNativeExecution</key>
+    <string>YES</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>10.6</string>
+    <key>CFBundleURLTypes</key>
+    <array>
+      <dict>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>CFBundleURLName</key>
+        <string>Stacktrace</string>
+        <key>CFBundleURLSchemes</key>
+        <array />
+      </dict>
+    </array>
+
+    <key>JVMOptions</key>
+    <dict>
+      <key>ClassPath</key>
+      <string>$APP_PACKAGE/Contents/lib/branding.jar:$APP_PACKAGE/Contents/lib/mps-boot.jar:$APP_PACKAGE/Contents/lib/boot.jar:$APP_PACKAGE/Contents/lib/bootstrap.jar:$APP_PACKAGE/Contents/lib/util.jar:$APP_PACKAGE/Contents/lib/jdom.jar:$APP_PACKAGE/Contents/lib/log4j.jar:$APP_PACKAGE/Contents/lib/extensions.jar:$APP_PACKAGE/Contents/lib/trove4j.jar</string>
+      <key>JVMVersion</key>
+      <string>1.8+</string>
+      <key>MainClass</key>
+      <string>jetbrains.mps.Launcher</string>
+      <key>Properties</key>
+      <dict>
+        <key>apple.laf.useScreenMenuBar</key>
+        <string>true</string>
+        <key>com.apple.mrj.application.live-resize</key>
+        <string>false</string>
+
+        <key>idea.path.selector</key>
+        <string>IDE61131-10</string>
+
+        <key>idea.java.redist</key>
+        <string>NoJavaDistribution</string>
+        <key>idea.home.path</key>
+        <string>$APP_PACKAGE/Contents</string>
+      </dict>
+      <key>VMOptions</key>
+      <string>-Dintellij.config.imported.in.current.session=true -Didea.paths.selector=IDE61131-10 -Dide.mac.message.dialogs.as.sheets=false -Dapple.awt.graphics.UseQuartz=true -Dfile.encoding=UTF-8 -client -Xss1024k -ea -Xmx2048m -XX:MaxPermSize=350m -XX:NewSize=256m -XX:+HeapDumpOnOutOfMemoryError -Xverify:none</string>
+      <key>WorkingDirectory</key>
+      <string>$APP_PACKAGE/Contents/bin</string>
+    </dict>
+  </dict>
+</plist>
diff --git a/build.sh b/build.sh
@@ -2,5 +2,4 @@
 rm -rf build/artifacts
 rm -rf build/tmp
 ant && ant -f buildDistribution.xml
-#cd  build/artifacts/st61131Distribution&& unzip st61131-143.SNAPSHOT-macos.zip
-#ant -v -d -f buildDistribution.xml
+#cd  build/artifacts/st61131Distribution && unzip *-mac.zip
diff --git a/build.xml b/build.xml
@@ -6,8 +6,9 @@
   <tstamp>
     <format property="date" pattern="yyyyMMdd" />
   </tstamp>
-  <property name="build.number" value="143.4" />
-  <property name="version" value="1.3.0" />
+  <property name="build.number" value="143.5" />
+  <property name="version" value="1.4.0" />
+  <property name="appName" value="Hardella" />
   <property name="mps_home" location="${basedir}/../../Documents/work/MPS 3.3" />
   <property name="mbeddr.github.core.home" location="${basedir}/../../Documents/work/mbeddr.core" />
   <property name="artifacts.mpsStandalone" location="${mps_home}" />
@@ -68,6 +69,20 @@
         </tokenfilter>
       </filterchain>
     </copy>
+    <copy todir="${build.layout}/bin">
+      <fileset file="${basedir}/bin/mac/Contents/Info.plist" />
+      <filterchain>
+        <replacetokens>
+          <token key="CFBundleGetInfoString" value="Hardella IDE ${version}" />
+        </replacetokens>
+        <replacetokens>
+          <token key="CFBundleShortVersionString" value="${version}" />
+        </replacetokens>
+        <replacetokens>
+          <token key="CFBundleVersion" value="Hardella-${version}" />
+        </replacetokens>
+      </filterchain>
+    </copy>
     <mkdir dir="${build.layout}/lib" />
     <copy todir="${build.layout}/lib">
       <fileset dir="${artifacts.mpsWorkbench}/lib">
@@ -94,34 +109,44 @@
     <mkdir dir="${build.tmp}/default/branding.jar/idea" />
     <echoxml file="${build.tmp}/default/branding.jar/idea/IdeaApplicationInfo.xml">
       <component>
-        <version codename="IDE 61131" major="1" minor="3" eap="true" />
+        <version codename="" major="1" minor="4.0" eap="false" />
         <company name="Vladimir Sitnikov" url="https://twitter.com/VladimirSitnikv" />
         <build number="${build.number}" date="${date}" />
-        <logo url="/splash.png" textcolor="002387" />
+        <logo url="/splash.png" textcolor="002387" progressColor="4269bc" progressY="394" progressHeight="3" />
         <about url="/about.png" />
-        <icon size32="/MPS32.png" size16="/MPS16.png" size32opaque="/MPS32.png" />
+        <icon size32="/icon_32x32.png" size16="/icon_16x16.png" size32opaque="/icon_32x32.png" size12="/icon_32x32.png" size128="/icon_128x128.png" ico="/icon_128x128.png" />
         <dialogs-image url="/dialogImage.png" />
         <package code="code" />
-        <names product="IDE 61131" fullname="IDE 61131" />
+        <names product="Hardella" fullname="Hardella IDE 61131" />
 
-        <welcome-screen logo-url="/logo.png" />
+        <welcome-screen logo-url="/icon_80x80.png" />
 
         <plugins url="" />
 
         <documentation url="https://github.com/vlsi/ide61131" />
         <support url="https://github.com/vlsi/ide61131/issues" />
-        <feedback eap-url="https://github.com/vlsi/ide61131/issues" />
-        <whatsnew url="New project wizard" />
+        <feedback release-url="https://github.com/vlsi/ide61131/issues" />
+        <whatsnew url="https://github.com/vlsi/ide61131#changelog" />
+        <third-party url="https://github.com/vlsi/ide61131" />
 
       </component>
     </echoxml>
     <jar destfile="${build.layout}/lib/branding.jar" duplicate="preserve">
-      <fileset file="${basedir}/icons/MPS16.png" />
-      <fileset file="${basedir}/icons/MPS32.png" />
-      <fileset file="${basedir}/icons/logo.png" />
+      <fileset file="${basedir}/icons/hardella.iconset/icon_16x16.png" />
+      <fileset file="${basedir}/icons/hardella.iconset/icon_32x32.png" />
+      <fileset file="${basedir}/icons/hardella.iconset/icon_128x128.png" />
+      <fileset file="${basedir}/icons/hardella.iconset/icon_128x128.png" />
+      <fileset file="${basedir}/icons/hardella.iconset/icon_32x32.png" />
+      <fileset file="${basedir}/icons/icon_80x80.png" />
       <fileset file="${basedir}/icons/splash.png" />
       <fileset file="${basedir}/icons/about.png" />
       <fileset file="${basedir}/icons/dialogImage.png" />
+      <fileset file="${basedir}/icons/splash@2x.png" />
+      <fileset file="${basedir}/icons/about@2x.png" />
+      <fileset file="${basedir}/icons/icon_80x80@2x.png" />
+      <fileset file="${basedir}/icons/hardella.iconset/icon_16x16@2x.png" />
+      <fileset file="${basedir}/icons/hardella.iconset/icon_32x32@2x.png" />
+      <fileset file="${basedir}/icons/hardella.iconset/icon_128x128@2x.png" />
       <fileset dir="${build.tmp}/default/branding.jar" />
     </jar>
     <mkdir dir="${build.layout}/plugins" />
@@ -191,9 +216,10 @@
     <echoxml file="${build.layout}/plugins/st61131/META-INF/plugin.xml">
       <idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
         <id>st61131</id>
-        <name>st61131</name>
+        <name>IDE 61131</name>
         <description>ST language support</description>
-        <version>1.3</version>
+        <version>${version}</version>
+        <vendor url="https://github.com/vlsi/ide61131" logo="/icon_16x16.png">Vladimir Sitnikov</vendor>
         <depends>jetbrains.mps.core</depends>
         <depends>jetbrains.mps.debugger.api</depends>
         <depends>jetbrains.mps.debugger.java</depends>
@@ -635,8 +661,12 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-com.github.vlsi.iec61131.cfc-generator-template" prefix="module/generator/template" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-com.github.vlsi.iec61131.cfc-models" prefix="module/models" />
     </jar>
+    <mkdir dir="${build.layout}/plugins/st61131/lib" />
+    <jar destfile="${build.layout}/plugins/st61131/lib/icons.jar" duplicate="preserve">
+      <fileset file="${basedir}/icons/hardella.iconset/icon_16x16.png" />
+    </jar>
     <echo file="${build.layout}/build.number">build.number=${build.number}${line.separator}date=${date}${line.separator}version=${version}</echo>
-    <echo file="${build.layout}/build.properties">st61131.date=${date}${line.separator}st61131.build.number=${build.number}${line.separator}st61131.version=${version}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps-sl-all.versionNumber=${mps-sl-all.versionNumber}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}</echo>
+    <echo file="${build.layout}/build.properties">st61131.date=${date}${line.separator}st61131.build.number=${build.number}${line.separator}st61131.version=${version}${line.separator}st61131.appName=${appName}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps-sl-all.versionNumber=${mps-sl-all.versionNumber}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}</echo>
   </target>
 
   <target name="buildDependents" />