Handling of buildInfo.txt and revisionInfo.txt are reworked

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/molby/trunk@301 a2be9bc6-48de-4e38-9406-05402d4bc13c

diff --git a/Makefile b/Makefile
index aa714df..911e217 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -94,17 +94,21 @@ $(DESTPREFIX)/Ruby_bind.a : ../MolLib/Ruby_bind/*.[ch]
 ALL_OBJECTS = $(OBJECTS) $(EXTRA_OBJECTS) $(LIBS) $(RESOURCE)
 DESTOBJECTS = $(addprefix $(DESTPREFIX)/,$(ALL_OBJECTS))
 $(DESTPREFIX)/$(EXECUTABLE) : $(DESTOBJECTS)
-       $(CC) -o $@ $(DESTOBJECTS) $(CFLAGS) $(LDFLAGS)
+ifeq ($(TARGET_PLATFORM),MAC)
+       sh ../record_build_date.sh --with-svn-status
+endif
+ifeq ($(TARGET_PLATFORM),MSW)
+       sh ../record_build_date.sh
+endif
+       $(CC) -c $(DESTPREFIX)/buildInfo.c -o $(DESTPREFIX)/buildInfo.o
+       $(CC) -o $@ $(DESTOBJECTS) $(DESTPREFIX)/buildInfo.o $(CFLAGS) $(LDFLAGS)
 
 $(DESTPREFIX)/$(PRODUCT) : $(DESTPREFIX)/$(EXECUTABLE) ../Scripts/*.rb amber11
 ifeq ($(TARGET_PLATFORM),MAC)
-       sh ../record_build_date.sh --with-svn-status
        rm -rf $(DESTPREFIX)/$(PRODUCT)
        mkdir -p $(DESTPREFIX)/$(PRODUCT)/Contents/MacOS
        mkdir -p $(DESTPREFIX)/$(PRODUCT)/Contents/Resources
        cp -f Info.plist $(DESTPREFIX)/$(PRODUCT)/Contents
-       cp -f buildInfo.txt $(DESTPREFIX)/$(PRODUCT)/Contents/Resources
-       cp -f ../revisionInfo.txt $(DESTPREFIX)/$(PRODUCT)/Contents/Resources
        echo -n "APPL????" > $(DESTPREFIX)/$(PRODUCT)/Contents/PkgInfo
        cp -r ../Scripts $(DESTPREFIX)/$(PRODUCT)/Contents/Resources
        cp -r amber11 $(DESTPREFIX)/$(PRODUCT)/Contents/Resources
@@ -113,13 +117,10 @@ ifeq ($(TARGET_PLATFORM),MAC)
        cp $(DESTPREFIX)/$(EXECUTABLE) $(DESTPREFIX)/$(PRODUCT)/Contents/MacOS
 endif
 ifeq ($(TARGET_PLATFORM),MSW)
-       sh ../record_build_date.sh
        rm -rf $(DESTPREFIX)/$(PRODUCT_DIR)
        mkdir -p $(DESTPREFIX)/$(PRODUCT_DIR)
        cp $(DESTPREFIX)/$(EXECUTABLE) $(DESTPREFIX)/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)
        cp `which mingwm10.dll` $(DESTPREFIX)/$(PRODUCT_DIR)
-       cp -f buildInfo.txt $(DESTPREFIX)/$(PRODUCT_DIR)
-       if [ -e ../revisionInfo.txt ]; then cp -f ../revisionInfo.txt $(DESTPREFIX)/$(PRODUCT_DIR); fi
        cp -r ../Scripts $(DESTPREFIX)/$(PRODUCT_DIR)
        cp -r amber11 $(DESTPREFIX)/$(PRODUCT_DIR)
        mkdir -p $(DESTPREFIX)/$(PRODUCT_DIR)/Scripts/lib

diff --git a/MolLib/Ruby_bind/ruby_bind.c b/MolLib/Ruby_bind/ruby_bind.c
index 722f1fc..2a0ad55 100644 (file)
--- a/MolLib/Ruby_bind/ruby_bind.c
+++ b/MolLib/Ruby_bind/ruby_bind.c
@@ -10316,7 +10316,7 @@ Molby_getDescription(void)
                asprintf(&revisionString, ", revision %d", gRevisionNumber);
        } else revisionString = "";
        asprintf(&s, 
-                        "Molby %s%s\n%s\n%s"
+                        "Molby %s%s\n%s\nLast compile: %s\n"
 #if !defined(__CMDMAC__)
                         "\nIncluding:\n"
                         "%s"
@@ -10355,7 +10355,7 @@ Molby_startup(const char *script, const char *dir)
        }
        
        /*  Read build and revision information for Molby  */
-       {
+/*     {
                char buf[200];
                extern int gRevisionNumber;
                extern char *gLastBuildString;
@@ -10381,13 +10381,13 @@ Molby_startup(const char *script, const char *dir)
                        }
                        fclose(fp);
                }
-               
+    } */
+
 #if defined(__CMDMAC__)
-               wbuf = Molby_getDescription();
-               printf("%s\n", wbuf);
-               free(wbuf);
+       wbuf = Molby_getDescription();
+       printf("%s\n", wbuf);
+       free(wbuf);
 #endif
-       }
        
        /*  Read atom display parameters  */
        if (ElementParameterInitialize("element.par", &wbuf) != 0) {

diff --git a/record_build_date.sh b/record_build_date.sh
index 4909142..e9fd2cd 100644 (file)
--- a/record_build_date.sh
+++ b/record_build_date.sh
@@ -1,6 +1,15 @@
 #!/bin/sh
 #  Usage: sh ../record_build_date.sh [--with-svn-status]
-echo "last_build = \"`date '+%Y-%m-%d %H:%M:%S %Z'`\"" > buildInfo.txt
+LAST_BUILD=`date '+%Y-%m-%d %H:%M:%S %Z'`
+echo "last_build = \"$LAST_BUILD\"" > buildInfo.txt
+echo "char *gLastBuildString = \"$LAST_BUILD\";" > build/buildInfo.c
 if [ "$1" = "--with-svn-status" ]; then
-  (cd ..; svn status -v . --depth=empty | awk '{print $1}' > revisionInfo.txt)
+  REVISION_INFO=`(cd ..; svn status -v . --depth=empty | awk '{print $1}')`
+  echo $REVISION_INFO > ../revisionInfo.txt
+else
+  REVISION_INFO=`cat ../revisionInfo.txt 2>/dev/null`
+  if [ "$REVISION_INFO" = "" ]; then
+    REVISION_INFO=0
+  fi
 fi
+echo "int gRevisionNumber = $REVISION_INFO;" >> build/buildInfo.c

diff --git a/wxSources/MyVersion.c b/wxSources/MyVersion.c
index 599df64..3fc022e 100644 (file)
--- a/wxSources/MyVersion.c
+++ b/wxSources/MyVersion.c
@@ -17,5 +17,6 @@
 
 const char *gVersionString = "v0.6.4";
 const char *gCopyrightString = "Copyright (c) 2008-2012 Toshi Nagata";
-int gRevisionNumber = 0;
-char *gLastBuildString = (char *)0;
+/*  The following are now defined in build/buildInfo.c, generated by record_build_date.sh  */
+/*int gRevisionNumber = 0;
+char *gLastBuildString = (char *)0; */

diff --git a/xcode-build/Molby.xcodeproj/project.pbxproj b/xcode-build/Molby.xcodeproj/project.pbxproj
index a29bb19..37d078e 100755 (executable)
--- a/xcode-build/Molby.xcodeproj/project.pbxproj
+++ b/xcode-build/Molby.xcodeproj/project.pbxproj
@@ -15,7 +15,6 @@
                E42D8AFA1030193F00C20247 /* MDForce.c in Sources */ = {isa = PBXBuildFile; fileRef = E42D8AF31030193F00C20247 /* MDForce.c */; };
                E42D8AFB1030193F00C20247 /* MDPressure.c in Sources */ = {isa = PBXBuildFile; fileRef = E42D8AF61030193F00C20247 /* MDPressure.c */; };
                E42D8BB31031BB2900C20247 /* ruby_md.c in Sources */ = {isa = PBXBuildFile; fileRef = E42D8BB21031BB2900C20247 /* ruby_md.c */; };
-               E42F28C013FE1052003FC85E /* buildInfo.txt in Resources */ = {isa = PBXBuildFile; fileRef = E42F28BF13FE1052003FC85E /* buildInfo.txt */; };
                E43226E30ECE8681004963D7 /* MySlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E43226E20ECE8681004963D7 /* MySlider.cpp */; };
                E433CE790EC7099B00675985 /* ruby_bind.c in Sources */ = {isa = PBXBuildFile; fileRef = E433CE760EC7099B00675985 /* ruby_bind.c */; };
                E433CE900EC709BD00675985 /* IntGroup.c in Sources */ = {isa = PBXBuildFile; fileRef = E433CE7C0EC709BD00675985 /* IntGroup.c */; };
@@ -42,7 +41,6 @@
                E43CCDE00EB20F0F00108D2D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E43CCDD70EB20F0F00108D2D /* OpenGL.framework */; };
                E43CCDE10EB20F0F00108D2D /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E43CCDD80EB20F0F00108D2D /* QuickTime.framework */; };
                E43CCDE20EB20F0F00108D2D /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E43CCDD90EB20F0F00108D2D /* System.framework */; };
-               E441806315BEA63000289B87 /* revisionInfo.txt in Resources */ = {isa = PBXBuildFile; fileRef = E441806215BEA63000289B87 /* revisionInfo.txt */; };
                E445145315F1DA5B0050171E /* MainViewCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = E445145215F1DA5B0050171E /* MainViewCommon.c */; };
                E445145415F1DA5B0050171E /* MainViewCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = E445145215F1DA5B0050171E /* MainViewCommon.c */; };
                E44CEED6100E1E9C0040BD51 /* ProgressFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E44CEED4100E1E9C0040BD51 /* ProgressFrame.cpp */; };
@@ -56,6 +54,8 @@
                E4A02357106B657D0094DBF8 /* Scripts in Resources */ = {isa = PBXBuildFile; fileRef = E4A0234A106B657D0094DBF8 /* Scripts */; };
                E4A1802811897F8600B394E7 /* wxKillAddition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4A1802711897F8600B394E7 /* wxKillAddition.cpp */; };
                E4A4667610C15B4300E40A9D /* listctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4A4667410C15B4300E40A9D /* listctrl.cpp */; };
+               E4A66F0F16365653003EE03A /* buildInfo.c in Sources */ = {isa = PBXBuildFile; fileRef = E4A66F0E16365653003EE03A /* buildInfo.c */; };
+               E4A66F1016365653003EE03A /* buildInfo.c in Sources */ = {isa = PBXBuildFile; fileRef = E4A66F0E16365653003EE03A /* buildInfo.c */; };
                E4C0C4960F25734B00161EC2 /* Dcd.c in Sources */ = {isa = PBXBuildFile; fileRef = E4C0C4950F25734B00161EC2 /* Dcd.c */; };
                E4C8CBDF10B83060006C4692 /* MyDocManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4C8CBDE10B83060006C4692 /* MyDocManager.cpp */; };
                E4CFBB3B111096CF0081C481 /* amber11 in Resources */ = {isa = PBXBuildFile; fileRef = E4CFBB16111096CF0081C481 /* amber11 */; };
@@ -103,7 +103,6 @@
                E42D8AF61030193F00C20247 /* MDPressure.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = MDPressure.c; sourceTree = "<group>"; };
                E42D8AF71030193F00C20247 /* MDPressure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MDPressure.h; sourceTree = "<group>"; };
                E42D8BB21031BB2900C20247 /* ruby_md.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ruby_md.c; sourceTree = "<group>"; };
-               E42F28BF13FE1052003FC85E /* buildInfo.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = buildInfo.txt; sourceTree = "<group>"; };
                E43226E10ECE8681004963D7 /* MySlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MySlider.h; path = ../wxSources/MySlider.h; sourceTree = SOURCE_ROOT; };
                E43226E20ECE8681004963D7 /* MySlider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MySlider.cpp; path = ../wxSources/MySlider.cpp; sourceTree = SOURCE_ROOT; };
                E433CE740EC7099B00675985 /* Molby_extern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Molby_extern.h; path = ../MolLib/Ruby_bind/Molby_extern.h; sourceTree = SOURCE_ROOT; };
@@ -151,7 +150,6 @@
                E43CCDD70EB20F0F00108D2D /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
                E43CCDD80EB20F0F00108D2D /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
                E43CCDD90EB20F0F00108D2D /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = /System/Library/Frameworks/System.framework; sourceTree = "<absolute>"; };
-               E441806215BEA63000289B87 /* revisionInfo.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = revisionInfo.txt; path = ../revisionInfo.txt; sourceTree = SOURCE_ROOT; };
                E445145215F1DA5B0050171E /* MainViewCommon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = MainViewCommon.c; sourceTree = "<group>"; };
                E44CEED4100E1E9C0040BD51 /* ProgressFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ProgressFrame.cpp; path = ../wxSources/ProgressFrame.cpp; sourceTree = SOURCE_ROOT; };
                E44CEED5100E1E9C0040BD51 /* ProgressFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressFrame.h; path = ../wxSources/ProgressFrame.h; sourceTree = SOURCE_ROOT; };
@@ -170,6 +168,7 @@
                E4A0234A106B657D0094DBF8 /* Scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Scripts; path = ../Scripts; sourceTree = SOURCE_ROOT; };
                E4A1802711897F8600B394E7 /* wxKillAddition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wxKillAddition.cpp; path = ../wxSources/wxKillAddition.cpp; sourceTree = SOURCE_ROOT; };
                E4A4667410C15B4300E40A9D /* listctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = listctrl.cpp; path = ../wxSources/listctrl.cpp; sourceTree = SOURCE_ROOT; };
+               E4A66F0E16365653003EE03A /* buildInfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = buildInfo.c; path = build/buildInfo.c; sourceTree = "<group>"; };
                E4C0C4940F25734B00161EC2 /* Dcd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Dcd.h; sourceTree = "<group>"; };
                E4C0C4950F25734B00161EC2 /* Dcd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Dcd.c; sourceTree = "<group>"; };
                E4C8CBDD10B83060006C4692 /* MyDocManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MyDocManager.h; path = ../wxSources/MyDocManager.h; sourceTree = SOURCE_ROOT; };
@@ -254,6 +253,7 @@
                        isa = PBXGroup;
                        children = (
                                E43CCF150EB3229800108D2D /* wxSources */,
+                               E4A66F0E16365653003EE03A /* buildInfo.c */,
                        );
                        name = Sources;
                        sourceTree = "<group>";
@@ -400,8 +400,6 @@
                                E4CFBB16111096CF0081C481 /* amber11 */,
                                E4A0233F106B652F0094DBF8 /* InfoPlist.strings */,
                                E4A0233B106B651C0094DBF8 /* Info.plist */,
-                               E42F28BF13FE1052003FC85E /* buildInfo.txt */,
-                               E441806215BEA63000289B87 /* revisionInfo.txt */,
                        );
                        name = Resources;
                        sourceTree = "<group>";
@@ -488,8 +486,6 @@
                                E4A02347106B65640094DBF8 /* molby_icon.icns in Resources */,
                                E4A02357106B657D0094DBF8 /* Scripts in Resources */,
                                E4CFBB3B111096CF0081C481 /* amber11 in Resources */,
-                               E42F28C013FE1052003FC85E /* buildInfo.txt in Resources */,
-                               E441806315BEA63000289B87 /* revisionInfo.txt in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -556,6 +552,7 @@
                                9E12580F119EC42E00E95DC3 /* docview.cpp in Sources */,
                                E445145415F1DA5B0050171E /* MainViewCommon.c in Sources */,
                                E4ED76E516256FC5006A1820 /* MyIPCSupport.cpp in Sources */,
+                               E4A66F0F16365653003EE03A /* buildInfo.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -583,6 +580,7 @@
                                E4D5ADA611808A2C00B1D8A4 /* cmdtool_stubs.c in Sources */,
                                9ECE828311A191A2001B435E /* Trackball.c in Sources */,
                                E445145315F1DA5B0050171E /* MainViewCommon.c in Sources */,
+                               E4A66F1016365653003EE03A /* buildInfo.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };