• R/O
  • HTTP
  • SSH
  • HTTPS

Molby: コミット

Molecular Modeling Software


コミットメタ情報

リビジョン6308f6926306b59beac141215c31990aaba4fd7d (tree)
日時2019-08-17 20:11:30
作者toshinagata1964 <toshinagata1964@a2be...>
コミッターtoshinagata1964

ログメッセージ

Windows: the installer now can install 64bit or 32bit version according to the OS architecture

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

変更サマリ

差分

--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ ifeq ($(TARGET_PLATFORM),MSW)
55 LIB_SUFFIX = -3.0-x86_64-w64-mingw32
66 WINE_PATH=/Applications/EasyWine.app/Contents/Resources/wine/bin
77 PRODUCT_SUFFIX = 64
8+ TARGET_ARCH_DEFINE = -DTARGET_ARCH=64
89 else
910 TOOL_PREFIX = i686-w64-mingw32-
1011 # CPP_EXTRA_FLAGS += -isystem /usr/local/mingw-w32/mingw/include
@@ -12,11 +13,13 @@ ifeq ($(TARGET_PLATFORM),MSW)
1213 LIB_SUFFIX = -3.0-i686-w64-mingw32
1314 WINE_PATH=/Applications/EasyWine.app/Contents/Resources/wine/bin
1415 PRODUCT_SUFFIX = 32
16+# FINAL_EXECUTABLE_SUFFIX = _32bit
17+ TARGET_ARCH_DEFINE = -DTARGET_ARCH=32
1518 endif
1619 WX_DIR = $(PWD)/../../wxWidgets-3.0.3
1720 WX_LIB_DIR = $(WX_DIR)/$(MSW_BUILD)/lib
1821 WX_ARCH_DIR = $(WX_LIB_DIR)/wx/include/$(TOOL_PREFIX)msw-unicode-static-3.0
19- WX_CPPFLAGS = -isystem $(WX_ARCH_DIR) -isystem $(WX_DIR)/include -D_LARGEFIILE_SOURCE=unknown -D__WXMSW__
22+ WX_CPPFLAGS = -isystem $(WX_ARCH_DIR) -isystem $(WX_DIR)/include -D_LARGEFIILE_SOURCE=unknown -D__WXMSW__ $(TARGET_ARCH_DEFINE)
2023 WX_LDFLAGS = -L$(WX_LIB_DIR) -Wl,--subsystem,windows -mwindows -lwx_mswu_gl$(LIB_SUFFIX) -lopengl32 -lglu32 -lwx_mswu$(LIB_SUFFIX) -lwxregexu$(LIB_SUFFIX) -lwxexpat$(LIB_SUFFIX) -lwxtiff$(LIB_SUFFIX) -lwxjpeg$(LIB_SUFFIX) -lwxpng$(LIB_SUFFIX) -lwxzlib$(LIB_SUFFIX) -lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32
2124 CPP_EXTRA_FLAGS = -isystem $(PWD)/../../CLAPACK-3.1.1.1-mingw/INCLUDE -isystem $(PWD)/../../fftw-3.3.2/$(MSW_BUILD)/include -I$(PWD)/../MolLib
2225 LD_EXTRA_FLAGS = -L$(PWD)/../../CLAPACK-3.1.1.1-mingw/$(MSW_BUILD)/lib -L$(PWD)/../../fftw-3.3.2/$(MSW_BUILD)/lib -llapackMinGW -lblasMinGW -lf2c_nomain -lfftw3 -static-libgcc -static-libstdc++ -Wl,-Bstatic,-lpthread
@@ -29,7 +32,7 @@ ifeq ($(TARGET_PLATFORM),MSW)
2932 RUBY_LDFLAGS = -L$(RUBY_DIR)/$(MSW_BUILD)/lib -lmsvcrt-ruby200-static -lws2_32 -lshlwapi -limagehlp -lenc -ltrans
3033 endif
3134 EXECUTABLE = _Molby.exe_
32- FINAL_EXECUTABLE = Molby.exe
35+ FINAL_EXECUTABLE = Molby$(FINAL_EXECUTABLE_SUFFIX).exe
3336 EXE_SUFFIX = .exe
3437 endif
3538
@@ -151,7 +154,7 @@ ifeq ($(TARGET_PLATFORM),MSW)
151154 echo PWD = $(PWD)
152155 rm -rf $(DESTPREFIX)/$(PRODUCT_DIR)
153156 mkdir -p $(DESTPREFIX)/$(PRODUCT_DIR)
154- cp $(DESTPREFIX)/$(EXECUTABLE) $(DESTPREFIX)/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)
157+ cp $(DESTPREFIX)/$(EXECUTABLE) "$(DESTPREFIX)/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)"
155158 # cp mingwm10.dll $(DESTPREFIX)/$(PRODUCT_DIR)
156159 cp -r ../Scripts $(DESTPREFIX)/$(PRODUCT_DIR)
157160 cp -r ../bitmaps/bitmaps $(DESTPREFIX)/$(PRODUCT_DIR)
@@ -171,7 +174,7 @@ ifneq ($(WINE_PATH),)
171174 else
172175 (/c/Program\ Files\ \(x86\)/Inno\ Setup\ 5/iscc molby$(PRODUCT_SUFFIX).iss || exit 1)
173176 endif
174- mv Output/SetupMolbyWin$(PRODUCT_SUFFIX).exe ../latest_binaries
177+ mv Output/SetupMolbyWin.exe ../latest_binaries
175178 (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*)
176179 endif
177180
--- a/MolLib/Ruby_bind/ruby_bind.c
+++ b/MolLib/Ruby_bind/ruby_bind.c
@@ -12101,7 +12101,17 @@ Molby_getDescription(char **versionString, char **auxString)
1210112101 if (gRevisionNumber > 0) {
1210212102 asprintf(&revisionString, ", revision %d", gRevisionNumber);
1210312103 } else revisionString = "";
12104- asprintf(&s1, "Molby %s%s\n%s\nLast compile: %s\n",
12104+
12105+ asprintf(&s1, "%s %s%s\n%s\nLast compile: %s\n",
12106+#if defined(__WXMSW__)
12107+ #if TARGET_ARCH == 64
12108+ "Molby (64 bit)",
12109+ #else
12110+ "Molby (32 bit)",
12111+ #endif
12112+#else
12113+ "Molby",
12114+#endif
1210512115 gVersionString, revisionString, gCopyrightString, gLastBuildString);
1210612116 asprintf(&s2,
1210712117 #if !defined(__CMDMAC__)
--- a/build-win/molby64.iss
+++ b/build-win/molby64.iss
@@ -1,15 +1,25 @@
1+; Create an installer that can install both 32bit and 64bit versions
12 [Setup]
23 AppName = Molby
3-AppVerName = Molby (v1.0, 64bit)
4+AppVerName = Molby (v1.0)
45 DefaultDirName = {pf}\Molby
56 DefaultGroupName = Molby
67 UninstallDisplayIcon = {app}\Molby.exe
7-OutputBaseFileName = SetupMolbyWin64
8+OutputBaseFileName = SetupMolbyWin
9+ArchitecturesInstallIn64BitMode = x64
810
911 [Files]
10-Source: "build\release\Molby\Molby.exe"; DestDir: {app}
12+; Install 64-bit version if running in 64-bit mode, 32-bit version otherwise.
13+; x86_64 files
14+Source: "build\release\Molby\Molby.exe"; DestDir: {app}; Check: Is64BitInstallMode
1115 Source: "build\release\Molby\amber11\bin\*"; DestDir: {app}\amber11\bin
12-Source: "build\release\Molby\amber11\dat\antechamber\*"; DestDir: {app}\amber11\dat\antechamber
16+Source: "build\release\Molby\ortep3\*"; DestDir: {app}\ortep3
17+; i386 files (the first one should be marked 'solidbreak')
18+Source: "..\build-win32\build\release\Molby\Molby.exe"; DestDir: {app}; Check: not Is64BitInstallMode; Flags: solidbreak
19+Source: "..\build-win32\build\release\Molby\amber11\bin\*"; DestDir: {app}\amber11\bin; Check: not Is64BitInstallMode
20+Source: "..\build-win32\build\release\Molby\ortep3\*"; DestDir: {app}\ortep3; Check: not Is64BitInstallMode
21+; Common files here (the first one should be marked 'solidbreak')
22+Source: "build\release\Molby\amber11\dat\antechamber\*"; DestDir: {app}\amber11\dat\antechamber; Flags: solidbreak
1323 Source: "build\release\Molby\amber11\dat\leap\parm\*"; DestDir: {app}\amber11\dat\leap\parm
1424 Source: "build\release\Molby\Scripts\*"; DestDir: {app}\Scripts
1525 Source: "build\release\Molby\Scripts\mbsf\*"; DestDir: {app}\Scripts\mbsf
@@ -22,7 +32,6 @@ Source: "build\release\Molby\Scripts\mbsf\fragments\*"; DestDir: {app}\Scripts\m
2232 Source: "build\release\Molby\Scripts\lib\*"; DestDir: {app}\Scripts\lib
2333 Source: "build\release\Molby\Scripts\basis_sets\*"; DestDir: {app}\Scripts\basis_sets
2434 Source: "build\release\Molby\bitmaps\*"; DestDir: {app}\bitmaps
25-Source: "build\release\Molby\ortep3\*"; DestDir: {app}\ortep3
2635
2736 [Icons]
2837 Name: "{group}\Molby"; Filename: "{app}\Molby.exe"
--- a/build-win32/molby32.iss
+++ b/build-win32/molby32.iss
@@ -1,8 +1,8 @@
11 [Setup]
22 AppName = Molby
33 AppVerName = Molby (v1.0, 32bit)
4-DefaultDirName = {pf}\Molby
5-DefaultGroupName = Molby
4+DefaultDirName = {pf}\Molby (32bit)
5+DefaultGroupName = Molby (32bit)
66 UninstallDisplayIcon = {app}\Molby.exe
77 OutputBaseFileName = SetupMolbyWin32
88
--- a/build-xcode/Molby.xcodeproj/project.pbxproj
+++ b/build-xcode/Molby.xcodeproj/project.pbxproj
@@ -721,7 +721,7 @@
721721 );
722722 runOnlyForDeploymentPostprocessing = 0;
723723 shellPath = /bin/sh;
724- shellScript = "if [ \"${BUILD_STYLE:=$CONFIGURATION}\" = \"Release\" ]; then\n (cd \"$PROJECT_DIR/../latest_binaries\" && rm -f MolbyMac.zip && zip -r MolbyMac.zip Molby -x \\*.DS_Store -x \\*.svn*) || exit 1\n (cd \"$PROJECT_DIR/../Documents\" && /usr/bin/ruby makedoc.rb && cp -a MolbyDoc \"$PROJECT_DIR/../latest_binaries\") || exit 1\n (cd \"$PROJECT_DIR/../latest_binaries\" && zip -r MolbyDoc.zip MolbyDoc -x \\*.DS_Store -x \\*.svn*) || exit 1\n (cd \"$PROJECT_DIR/../build-win32\"; PATH=/usr/local/homebrew/bin:$PATH; make setup) || exit 1\n (cd \"$PROJECT_DIR/../build-win\"; PATH=/usr/local/homebrew/bin:$PATH; make setup) || exit 1\nfi\n";
724+ shellScript = "if [ \"${BUILD_STYLE:=$CONFIGURATION}\" = \"Release\" ]; then\n (cd \"$PROJECT_DIR/../latest_binaries\" && rm -f MolbyMac.zip && zip -r MolbyMac.zip Molby -x \\*.DS_Store -x \\*.svn*) || exit 1\n (cd \"$PROJECT_DIR/../Documents\" && /usr/bin/ruby makedoc.rb && cp -a MolbyDoc \"$PROJECT_DIR/../latest_binaries\") || exit 1\n (cd \"$PROJECT_DIR/../latest_binaries\" && zip -r MolbyDoc.zip MolbyDoc -x \\*.DS_Store -x \\*.svn*) || exit 1\n#(cd \"$PROJECT_DIR/../build-win32\"; PATH=/usr/local/homebrew/bin:$PATH; make setup) || exit 1\n (cd \"$PROJECT_DIR/../build-win\"; PATH=/usr/local/homebrew/bin:$PATH; make setup) || exit 1\nfi\n";
725725 };
726726 E4FC7B57183E516E0064FB2E /* ShellScript */ = {
727727 isa = PBXShellScriptBuildPhase;
Binary files a/build-xcode/Molby.xcodeproj/project.xcworkspace/xcuserdata/toshi_n.xcuserdatad/UserInterfaceState.xcuserstate and b/build-xcode/Molby.xcodeproj/project.xcworkspace/xcuserdata/toshi_n.xcuserdatad/UserInterfaceState.xcuserstate differ
--- a/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -42,6 +42,11 @@
4242 <key>primary</key>
4343 <true/>
4444 </dict>
45+ <key>E4CB370B1FE2C1F7001BB75E</key>
46+ <dict>
47+ <key>primary</key>
48+ <true/>
49+ </dict>
4550 <key>E4CB370F1FE4FF0E001BB75E</key>
4651 <dict>
4752 <key>primary</key>
--- a/wxSources/MyApp.cpp
+++ b/wxSources/MyApp.cpp
@@ -1707,12 +1707,14 @@ AboutDialog::AboutDialog():
17071707 // |
17081708 // |-> copyright messages
17091709
1710- char *s1, *s2;
1711- Molby_getDescription(&s1, &s2);
1710+ char *s1, *s2, *s3;
1711+ s1 = "Molby";
1712+ Molby_getDescription(&s2, &s3);
17121713 wxString str1(s1, WX_DEFAULT_CONV);
17131714 wxString str2(s2, WX_DEFAULT_CONV);
1714- free(s1);
1715+ wxString str3(s3, WX_DEFAULT_CONV);
17151716 free(s2);
1717+ free(s3);
17161718 #if defined(__WXMSW__)
17171719 wxFont *textFont0 = new wxFont(12, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
17181720 wxFont *textFont1 = new wxFont(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
@@ -1729,7 +1731,7 @@ AboutDialog::AboutDialog():
17291731 wxBitmap *molbyBitmap = new wxBitmap(tifname, wxBITMAP_TYPE_PNG);
17301732 wxStaticText *stext1 = new wxStaticText(this, -1, wxT("Molby"));
17311733 stext1->SetFont(*textFont0);
1732- wxStaticText *stext2 = new wxStaticText(this, -1, str1);
1734+ wxStaticText *stext2 = new wxStaticText(this, -1, str2);
17331735 stext2->SetFont(*textFont1);
17341736 wxStaticBitmap *staticBitmap = new wxStaticBitmap(this, -1, *molbyBitmap);
17351737 vsizer2->Add(stext1, 0, wxALL | wxEXPAND, 2);
@@ -1738,7 +1740,7 @@ AboutDialog::AboutDialog():
17381740 hsizer1->Add(staticBitmap, 0, 0, 10);
17391741 hsizer1->AddSpacer(20);
17401742 hsizer1->Add(vsizer2, 0, wxALL | wxEXPAND, 5);
1741- wxStaticText *stext3 = new wxStaticText(this, -1, str2);
1743+ wxStaticText *stext3 = new wxStaticText(this, -1, str3);
17421744 stext3->SetFont(*textFont2);
17431745 vsizer1->Add(hsizer1, 0, wxALL | wxEXPAND, 5);
17441746 vsizer1->Add(stext3, 0, wxALL | wxEXPAND, 5);
旧リポジトリブラウザで表示