version using date time and commit hash

lomorage · Jun 4, 2019 · 27eb0b3 · 27eb0b3
1 parent ff6d861
commit 27eb0b3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/LomoAgent/AboutWindow.swift b/LomoAgent/AboutWindow.swift
@@ -27,7 +27,7 @@ class AboutWindow: NSWindowController {
         NSApp.activate(ignoringOtherApps: true)
 
         if let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String {
-            versionLabel.stringValue = "v\(version)"
+            versionLabel.stringValue = "ver: \(version)"
         }
 
     }

diff --git a/LomoAgent/AppDelegate.swift b/LomoAgent/AppDelegate.swift
@@ -20,7 +20,7 @@ extension OSLog {
 class AppDelegate: NSObject, NSApplicationDelegate {
 
     func applicationWillFinishLaunching(_ aNotification: Notification) {
-        let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
+        let version = Bundle.main.infoDictionary?["CFBundleVersion"] as! String
         let arguments = CommandLine.arguments
         var exit = false
         for arg in arguments {

diff --git a/LomoAgent/Base.lproj/AboutWindow.xib b/LomoAgent/Base.lproj/AboutWindow.xib
@@ -38,15 +38,6 @@
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="whH-lp-w3F">
-                        <rect key="frame" x="112" y="180" width="48" height="17"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="version" id="Iox-9E-p6j">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="au3-O2-T7i">
                         <rect key="frame" x="40" y="47" width="192" height="119"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -71,6 +62,15 @@
                             <userDefinedRuntimeAttribute type="string" keyPath="href" value="https://lomorage.com/"/>
                         </userDefinedRuntimeAttributes>
                     </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="whH-lp-w3F">
+                        <rect key="frame" x="68" y="180" width="137" height="17"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="version" id="Iox-9E-p6j">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
                 </subviews>
             </view>
             <connections>

diff --git a/LomoAgent/Info.plist b/LomoAgent/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2</string>
+	<string>ff6d861</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2019_06_04.09_09_24.0.ff6d861</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>