From 8c5686ab553b95b99ab0550f387e4f134b018b84 Mon Sep 17 00:00:00 2001
From: Oliver Bock <oliver.bock@aei.mpg.de>
Date: Fri, 20 Jun 2008 16:47:13 +0200
Subject: [PATCH] Changed BOINC source from trunk to 6.2 branch
* Avoids build failures due to trunk being too volatile
* Removed stackwalker_win.cpp patch (not required for 6.2)
* Changed back to uppercase include dir (BOINC)
---
build.sh | 29 +++++++++----------
.../boinc.stackwalker_win.cpp.minggw.patch | 20 -------------
src/framework/Makefile | 2 +-
src/framework/Makefile.mingw | 2 +-
src/starsphere/Makefile | 2 +-
src/starsphere/Makefile.macos | 2 +-
src/starsphere/Makefile.mingw | 2 +-
7 files changed, 19 insertions(+), 40 deletions(-)
delete mode 100644 patches/boinc.stackwalker_win.cpp.minggw.patch
diff --git a/build.sh b/build.sh
index c5c402f..e01d81f 100755
--- a/build.sh
+++ b/build.sh
@@ -156,7 +156,7 @@ prepare_generic()
svn update >> $LOGFILE 2>&1 || failure
else
echo "Retrieving BOINC (this may take a while)..." | tee -a $LOGFILE
- svn checkout http://boinc.berkeley.edu/svn/trunk/boinc . >> $LOGFILE 2>&1 || failure
+ svn checkout http://boinc.berkeley.edu/svn/branches/boinc_core_release_6_2 . >> $LOGFILE 2>&1 || failure
fi
return 0
@@ -316,7 +316,6 @@ build_generic_win32()
cd $ROOT/3rdparty/boinc/lib || failure
# patch: fix a couple of BOINC vs. MinGW issues
patch boinc_win.h < $ROOT/patches/boinc.boinc_win.h.minggw.patch >> $LOGFILE 2>&1 || failure
- patch stackwalker_win.cpp < $ROOT/patches/boinc.stackwalker_win.cpp.minggw.patch >> $LOGFILE 2>&1 || failure
patch filesys.C < $ROOT/patches/boinc.filesys.C.mingw.patch >> $LOGFILE 2>&1 || failure
# patch: add graphics2 and customize build path (see below)
echo "Building BOINC (this may take a while)..." | tee -a $LOGFILE
@@ -332,19 +331,19 @@ build_generic_win32()
cd $ROOT/build/boinc || failure
make -f api/Makefile.mingw >> $LOGFILE 2>&1 || failure
cp $ROOT/build/boinc/libboinc.a $ROOT/install/lib >> $LOGFILE 2>&1 || failure
- mkdir -p $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
- cp $ROOT/3rdparty/boinc/api/boinc_api.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
- cp $ROOT/3rdparty/boinc/api/graphics2.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
- cp $ROOT/3rdparty/boinc/lib/app_ipc.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
- cp $ROOT/3rdparty/boinc/lib/boinc_win.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
- cp $ROOT/3rdparty/boinc/lib/common_defs.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
- cp $ROOT/3rdparty/boinc/lib/hostinfo.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
- cp $ROOT/3rdparty/boinc/lib/proxy_info.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
- cp $ROOT/3rdparty/boinc/lib/prefs.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
- cp $ROOT/3rdparty/boinc/lib/miofile.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
- cp $ROOT/3rdparty/boinc/lib/mfile.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
- cp $ROOT/3rdparty/boinc/lib/parse.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
- cp $ROOT/3rdparty/boinc/lib/util.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
+ mkdir -p $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
+ cp $ROOT/3rdparty/boinc/api/boinc_api.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
+ cp $ROOT/3rdparty/boinc/api/graphics2.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
+ cp $ROOT/3rdparty/boinc/lib/app_ipc.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
+ cp $ROOT/3rdparty/boinc/lib/boinc_win.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
+ cp $ROOT/3rdparty/boinc/lib/common_defs.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
+ cp $ROOT/3rdparty/boinc/lib/hostinfo.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
+ cp $ROOT/3rdparty/boinc/lib/proxy_info.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
+ cp $ROOT/3rdparty/boinc/lib/prefs.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
+ cp $ROOT/3rdparty/boinc/lib/miofile.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
+ cp $ROOT/3rdparty/boinc/lib/mfile.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
+ cp $ROOT/3rdparty/boinc/lib/parse.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
+ cp $ROOT/3rdparty/boinc/lib/util.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
echo "Successfully built and installed BOINC!" | tee -a $LOGFILE
}
diff --git a/patches/boinc.stackwalker_win.cpp.minggw.patch b/patches/boinc.stackwalker_win.cpp.minggw.patch
deleted file mode 100644
index 3c135a0..0000000
--- a/patches/boinc.stackwalker_win.cpp.minggw.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- stackwalker_win.cpp
-+++ stackwalker_win.cpp 2008-06-03 17:37:38.000000000 +0200
-@@ -353,7 +353,7 @@
- }
- _ftprintf(stderr, _T("(%s Symbols Loaded)") , szSymbolType);
- _ftprintf(stderr, _T("\n"));
-- _ftprintf(stderr, _T(" Linked PDB Filename : %s\n") , Module.CVData);
-+// _ftprintf(stderr, _T(" Linked PDB Filename : %s\n") , Module.CVData);
- if (bFileVersionSupported && bFileVersionRetrieved) {
- _ftprintf(stderr, _T(" File Version : %s\n") , szFileVersion);
- _ftprintf(stderr, _T(" Company Name : %s\n") , szCompanyName);
-@@ -657,7 +657,7 @@
- // #################################################################################
- // Here the Stackwalk-Part begins.
- // Some of the code is from an example from a book
--// But I couldn�t find the reference anymore... sorry...
-+// But I couldn�t find the reference anymore... sorry...
- // If someone knowns, please let me know...
- // #################################################################################
- // #################################################################################
diff --git a/src/framework/Makefile b/src/framework/Makefile
index 6bc64f1..02108c0 100644
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -28,7 +28,7 @@ CXX?=g++
# variables
CPPFLAGS = $(shell $(FRAMEWORK_INSTALL)/bin/sdl-config --cflags)
CPPFLAGS += $(shell $(FRAMEWORK_INSTALL)/bin/freetype-config --cflags)
-CPPFLAGS += -I$(FRAMEWORK_INSTALL)/include/boinc -I/usr/include
+CPPFLAGS += -I$(FRAMEWORK_INSTALL)/include/BOINC -I/usr/include
DEPS = Makefile
OBJS = AbstractGraphicsEngine.o GraphicsEngineFactory.o WindowManager.o Resource.o ResourceFactory.o BOINCClientAdapter.o
diff --git a/src/framework/Makefile.mingw b/src/framework/Makefile.mingw
index 6b0b140..44a4769 100644
--- a/src/framework/Makefile.mingw
+++ b/src/framework/Makefile.mingw
@@ -28,7 +28,7 @@ CXX?=g++
# variables
CPPFLAGS = $(shell $(FRAMEWORK_INSTALL)/bin/sdl-config --cflags)
CPPFLAGS += $(shell $(FRAMEWORK_INSTALL)/bin/freetype-config --cflags)
-CPPFLAGS += -I$(FRAMEWORK_INSTALL)/include/boinc -I$(FRAMEWORK_INSTALL)/include
+CPPFLAGS += -I$(FRAMEWORK_INSTALL)/include/BOINC -I$(FRAMEWORK_INSTALL)/include
DEPS = Makefile
OBJS = AbstractGraphicsEngine.o GraphicsEngineFactory.o WindowManager.o Resource.o ResourceFactory.o BOINCClientAdapter.o
diff --git a/src/starsphere/Makefile b/src/starsphere/Makefile
index 7462c02..53da9b3 100644
--- a/src/starsphere/Makefile
+++ b/src/starsphere/Makefile
@@ -34,7 +34,7 @@ LIBS += -Wl,-Bdynamic $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --static-libs
CPPFLAGS = -I$(STARSPHERE_INSTALL)/include
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --cflags)
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --cflags)
-CPPFLAGS += -I$(STARSPHERE_INSTALL)/include/boinc -I/usr/include
+CPPFLAGS += -I$(STARSPHERE_INSTALL)/include/BOINC -I/usr/include
DEPS = Makefile
OBJS = Starsphere.o StarsphereS5R3.o EinsteinS5R3Adapter.o starlist.o snr_list.o pulsar_list.o $(RESOURCESPEC).o
diff --git a/src/starsphere/Makefile.macos b/src/starsphere/Makefile.macos
index 36d52a8..8627bea 100644
--- a/src/starsphere/Makefile.macos
+++ b/src/starsphere/Makefile.macos
@@ -34,7 +34,7 @@ LIBS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --static-libs)
CPPFLAGS = -I$(STARSPHERE_INSTALL)/include
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --cflags)
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --cflags)
-CPPFLAGS += -I$(STARSPHERE_INSTALL)/include/boinc -I/usr/include
+CPPFLAGS += -I$(STARSPHERE_INSTALL)/include/BOINC -I/usr/include
DEPS = Makefile
OBJS = Starsphere.o StarsphereS5R3.o EinsteinS5R3Adapter.o starlist.o snr_list.o pulsar_list.o $(RESOURCESPEC).o
diff --git a/src/starsphere/Makefile.mingw b/src/starsphere/Makefile.mingw
index 57828dc..717f689 100644
--- a/src/starsphere/Makefile.mingw
+++ b/src/starsphere/Makefile.mingw
@@ -34,7 +34,7 @@ LIBS += -Wl,-Bdynamic $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --static-libs
CPPFLAGS = -I$(STARSPHERE_INSTALL)/include
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --cflags)
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --cflags)
-CPPFLAGS += -I$(STARSPHERE_INSTALL)/include/boinc
+CPPFLAGS += -I$(STARSPHERE_INSTALL)/include/BOINC
DEPS = Makefile
OBJS = Starsphere.o StarsphereS5R3.o EinsteinS5R3Adapter.o starlist.o snr_list.o pulsar_list.o $(RESOURCESPEC).o
--
GitLab