Version 1.0.2

diff --git a/Makefile b/Makefile
index f6b8813..55ffc78 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -166,12 +166,16 @@ ifeq ($(TARGET_PLATFORM),MSW)
        cp -r ortep3 $(DESTPREFIX)/$(PRODUCT_DIR)
        mkdir -p $(DESTPREFIX)/$(PRODUCT_DIR)/Scripts/lib
        for i in $(RUBY_EXTLIB); do cp $(RUBY_DIR)/lib/$$i $(DESTPREFIX)/$(PRODUCT_DIR)/Scripts/lib; done
+ifneq ($(DEBUG),1)
+       for i in $(DESTPREFIX)/$(PRODUCT_DIR)/*.exe $(DESTPREFIX)/$(PRODUCT_DIR)/amber11/bin/*.exe $(DESTPREFIX)/$(PRODUCT_DIR)/ortep3/*.exe; do $(TOOL_PREFIX)strip "$$i"; done
+endif
 endif
 
 ifeq ($(TARGET_PLATFORM),MSW)
+ifneq ($(DEBUG),1)
 install: setup
 
-setup: build/release/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)
+setup: $(DESTPREFIX) $(DESTPREFIX)/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)
        mkdir -p ../latest_binaries
 ifneq ($(WINE_PATH),)
        ($(WINE_PATH)/wine ../../Inno\ Setup\ 5/ISCC.exe molby$(PRODUCT_SUFFIX).iss || exit 1)
@@ -181,6 +185,7 @@ endif
        mv Output/$(SETUP_NAME).exe ../latest_binaries
        (cd build/release/$(PRODUCT_DIR) && rm -rf $(MAKEDIR)/../latest_binaries/MolbyWin$(PRODUCT_SUFFIX).zip && zip -r $(MAKEDIR)/../latest_binaries/MolbyWin$(PRODUCT_SUFFIX).zip * -x \*.DS_Store \*.svn*)
 endif
+endif
 
 clean:
        rm -f $(DESTPREFIX)/*.o $(DESTPREFIX)/*.a $(DESTPREFIX)/$(EXECUTABLE)

diff --git a/README b/README
index 8f2c0f1..95945cd 100644 (file)
--- a/README
+++ b/README
@@ -5,7 +5,7 @@
     An Interactive Molecular Modeling Software
         with Integrated Ruby Interpreter
   
-          Version 1.0.1
+          Version 1.0.2
 
                   Toshi Nagata
 

diff --git a/Version b/Version
index 86774ad..4098653 100644 (file)
--- a/Version
+++ b/Version
@@ -1 +1 @@
-version = "1.0.1"
+version = "1.0.2"

diff --git a/build-win/molby64.iss b/build-win/molby64.iss
index ad0153b..997aee9 100644 (file)
--- a/build-win/molby64.iss
+++ b/build-win/molby64.iss
@@ -1,7 +1,7 @@
 ;  Create an installer that can install both 32bit and 64bit versions
 [Setup]
 AppName = Molby
-AppVerName = Molby (v1.0.1)
+AppVerName = Molby (v1.0.2)
 DefaultDirName = {pf}\Molby
 DefaultGroupName = Molby
 UninstallDisplayIcon = {app}\Molby.exe

diff --git a/build-win32/molby32.iss b/build-win32/molby32.iss
index 68188fe..4120948 100644 (file)
--- a/build-win32/molby32.iss
+++ b/build-win32/molby32.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName = Molby
-AppVerName = Molby (v1.0.1)
+AppVerName = Molby (v1.0.2)
 DefaultDirName = {pf}\Molby (32bit)
 DefaultGroupName = Molby (32bit)
 UninstallDisplayIcon = {app}\Molby.exe

diff --git a/build-xcode/Molby-Info.plist b/build-xcode/Molby-Info.plist
old mode 100755 (executable)
new mode 100644 (file)
index ae53335..4387dfa
--- a/build-xcode/Molby-Info.plist
+++ b/build-xcode/Molby-Info.plist
@@ -36,6 +36,10 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>v1.0.1</string>
+       <string>v1.0.2</string>
+       <key>CFBundleShortVersionString</key>
+       <string>Version 1.0.2</string>
+       <key>NSHumanReadableCopyright</key>
+       <string>Copyright 2008-2021 Toshi Nagata</string>
 </dict>
 </plist>

diff --git a/build-xcode/Molby.xcodeproj/project.pbxproj b/build-xcode/Molby.xcodeproj/project.pbxproj
index 963919e..a9d44e8 100644 (file)
--- a/build-xcode/Molby.xcodeproj/project.pbxproj
+++ b/build-xcode/Molby.xcodeproj/project.pbxproj
@@ -213,6 +213,7 @@
                E420BE20188574F600A2B983 /* RubyDialogFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RubyDialogFrame.h; sourceTree = "<group>"; };
                E420BE21188574F600A2B983 /* wxKillAddition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wxKillAddition.cpp; sourceTree = "<group>"; };
                E45B94611A170B9A008E95EB /* docview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = docview.cpp; sourceTree = "<group>"; };
+               E460B2DC2739716500CD9407 /* Version */ = {isa = PBXFileReference; lastKnownFileType = text; name = Version; path = ../Version; sourceTree = "<group>"; };
                E4653CB018A0CC7D0022377B /* textctrl_addition.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = textctrl_addition.mm; sourceTree = "<group>"; };
                E49B3DF62306D9F500422E13 /* buildInfo_cmd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = buildInfo_cmd.c; sourceTree = "<group>"; };
                E49BFB761886E2E400188237 /* Molby_command */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Molby_command; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -358,6 +359,7 @@
                                E4FC7779183E4F3F0064FB2E /* MolLib */,
                                E4FC7CA5183F94D30064FB2E /* buildInfo.c */,
                                E49B3DF62306D9F500422E13 /* buildInfo_cmd.c */,
+                               E460B2DC2739716500CD9407 /* Version */,
                        );
                        name = Sources;
                        sourceTree = "<group>";
@@ -578,6 +580,7 @@
                        buildPhases = (
                                E471B4952734058600486093 /* ShellScript */,
                                E4FC7B57183E516E0064FB2E /* ShellScript */,
+                               E460B2DD273A94C600CD9407 /* ShellScript */,
                                8D1107290486CEB800E47090 /* Resources */,
                                8D11072C0486CEB800E47090 /* Sources */,
                                8D11072E0486CEB800E47090 /* Frameworks */,
@@ -694,6 +697,23 @@
                        shellPath = /bin/sh;
                        shellScript = "if [ \"${BUILD_STYLE:=$CONFIGURATION}\" = \"Release\" ]; then\n  mkdir -p \"$PROJECT_DIR/../latest_binaries/Molby\" || exit 1\n  (cd \"$PROJECT_DIR/../latest_binaries/Molby\" && rm -rf Molby_command Molby_resources) || exit 1\n(cd \"$BUILT_PRODUCTS_DIR\"; echo $PWD; cp -a -H Molby_command Molby_resources \"$PROJECT_DIR/../latest_binaries/Molby\") || exit 1\nfi\n";
                };
+               E460B2DD273A94C600CD9407 /* ShellScript */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                       );
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "cd $PROJECT_DIR/../Documents\nif [ ! -e MolbyDoc/ja/index.html ] || [ src/doc_source.html -nt MolbyDoc/ja/index.html ]; then\n  ruby makedoc.rb\nfi\n";
+               };
                E471B4952734058600486093 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;

diff --git a/update_version.rb b/update_version.rb
index 926fd07..f8aad53 100644 (file)
--- a/update_version.rb
+++ b/update_version.rb
@@ -43,10 +43,14 @@ def modify_file(name, &block)
 end
 
 #  Modify Info.plist
-nm = "xcode-build/Info.plist"
+nm = "build-xcode/Molby-Info.plist"
 version = false
 modify_file(nm) { |s|
-  if version
+  if s =~ /Copyright/
+    s.sub(/[-0-9]+ Toshi Nagata/, "#{yrange} Toshi Nagata")
+  elsif s =~ /Version \d+\.\d+/
+    "\t<string>Version #{ver}</string>\n"
+  elsif version
     version = false
     "\t<string>#{verstr}</string>\n"
   else

diff --git a/wxSources/MyVersion.c b/wxSources/MyVersion.c
index 3240501..89fe49a 100644 (file)
--- a/wxSources/MyVersion.c
+++ b/wxSources/MyVersion.c
@@ -15,7 +15,7 @@
  GNU General Public License for more details.
  */
 
-const char *gVersionString = "v1.0.1";
+const char *gVersionString = "v1.0.2";
 const char *gCopyrightString = "Copyright (c) 2008-2021 Toshi Nagata";
 /*  The following are now defined in build/buildInfo.c, generated by record_build_date.sh  */
 /*int gRevisionNumber = 0;