[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-296-gdc96a5e
Steffen Moeller
moeller at debian.org
Sun Jul 24 22:59:54 UTC 2011
The following commit has been merged in the master branch:
commit e3c074b5eaa1ea5c79e078820d10707511a71388
Author: Steffen Moeller <moeller at debian.org>
Date: Mon Jul 25 00:27:19 2011 +0200
Maintenance of install scripts.
diff --git a/debian/boinc-server-maker.install b/debian/boinc-server-maker.install
index 809991b..aa0b67f 100644
--- a/debian/boinc-server-maker.install
+++ b/debian/boinc-server-maker.install
@@ -28,8 +28,6 @@ tools/run_in_ops usr/lib/boinc-server/tools
#html/user/server_status.php usr/share/boinc-server/html/user
-#usr/bin/calculate_credit_multiplier usr/share/boinc-server/tools
-tools/calculate_credit_multiplier usr/share/boinc-server/tools
#usr/bin/dbcheck_files_exist usr/share/boinc-server/tools
tools/dbcheck_files_exist usr/share/boinc-server/tools
#usr/bin/grep_logs usr/share/boinc-server/tools
@@ -71,12 +69,8 @@ sched/get_file usr/lib/boinc-server/bin
#usr/bin/make_work usr/lib/boinc-server/bin
sched/make_work usr/lib/boinc-server/bin
sched/message_handler usr/lib/boinc-server/bin
-#usr/bin/request_file_list usr/lib/boinc-server/bin
-sched/request_file_list usr/lib/boinc-server/bin
#usr/bin/sched_driver usr/lib/boinc-server/bin
sched/sched_driver usr/lib/boinc-server/bin
-#usr/bin/send_file usr/lib/boinc-server/bin
-sched/send_file usr/lib/boinc-server/bin
#usr/bin/start usr/share/boinc-server/bin
sched/start usr/lib/boinc-server/bin
#usr/bin/status usr/share/boinc-server/bin
@@ -85,7 +79,6 @@ sched/status usr/lib/boinc-server/bin
sched/stop usr/share/boinc-server/bin
#usr/bin/show_shmem usr/lib/boinc-server/bin
sched/show_shmem usr/lib/boinc-server/bin
-sched/trickle_handler usr/lib/boinc-server/bin
sched/update_stats usr/lib/boinc-server/bin
sched/wu_check usr/lib/boinc-server/bin
sched/file_upload_handler usr/lib/boinc-server/bin
diff --git a/debian/boinc-server-maker.links b/debian/boinc-server-maker.links
index 9508bc1..c3e940e 100644
--- a/debian/boinc-server-maker.links
+++ b/debian/boinc-server-maker.links
@@ -13,13 +13,10 @@ usr/lib/boinc-server/bin/file_deleter usr/share/boinc-server/sched/file_deleter
usr/lib/boinc-server/bin/get_file usr/share/boinc-server/sched/get_file
usr/lib/boinc-server/bin/make_work usr/share/boinc-server/sched/make_work
usr/lib/boinc-server/bin/message_handler usr/share/boinc-server/sched/message_handler
-usr/lib/boinc-server/bin/request_file_list usr/share/boinc-server/sched/request_file_list
usr/lib/boinc-server/bin/sched_driver usr/share/boinc-server/sched/sched_driver
-usr/lib/boinc-server/bin/send_file usr/share/boinc-server/sched/send_file
usr/lib/boinc-server/bin/show_shmem usr/share/boinc-server/sched/show_shmem
usr/lib/boinc-server/bin/start usr/share/boinc-server/bin/start
usr/lib/boinc-server/bin/status usr/share/boinc-server/bin/status
-usr/lib/boinc-server/bin/trickle_handler usr/share/boinc-server/sched/trickle_handler
usr/lib/boinc-server/bin/update_stats usr/share/boinc-server/sched/update_stats
usr/lib/boinc-server/bin/wu_check usr/share/boinc-server/sched/wu_check
usr/lib/boinc-server/bin/file_upload_handler usr/share/boinc-server/sched/file_upload_handler
diff --git a/debian/patches/series b/debian/patches/series
index 9c2e4f8..9082505 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ file_upload_handler_permission.patch
possible_size_type_error.patch
upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
debian_debian_AdjustBoincTopdirPython.patch
+AddedErroneouslyRemovedMakefileForExamplesUc2App.patch
diff --git a/samples/atiopencl/Makefile b/samples/atiopencl/Makefile
new file mode 100644
index 0000000..be9438a
--- /dev/null
+++ b/samples/atiopencl/Makefile
@@ -0,0 +1,37 @@
+# makefile for atiopencl BOINC example appication on Linux.
+
+BOINC_DIR = ../..
+BOINC_API_DIR = $(BOINC_DIR)/api
+BOINC_LIB_DIR = $(BOINC_DIR)/lib
+
+CXXFLAGS = -g \
+ -I$(BOINC_DIR) \
+ -I$(BOINC_LIB_DIR) \
+ -I$(BOINC_API_DIR) \
+ -I ../../../ati-stream-sdk-v2.1-lnx32/include \
+ -lpthread \
+ -L.
+
+PROGS = atiopencl \
+
+all: $(PROGS)
+
+libstdc++.a:
+ ln -s `g++ -print-file-name=libstdc++.a`
+
+clean:
+ /bin/rm -f $(PROGS) *.o libstdc++.a
+
+distclean:
+ /bin/rm -f $(PROGS) *.o libstdc++.a
+
+install: atiopencl
+
+atiopencl: atiopencl.o libstdc++.a
+ $(CXX) $(CXXFLAGS) -o atiopencl atiopencl.o libstdc++.a \
+ -lOpenCL -L../../../ati-stream-sdk-v2.1-lnx32/lib/x86 \
+ -lboinc_api -L$(BOINC_API_DIR) \
+ -lboinc -L$(BOINC_LIB_DIR)
+
+atiopencl.o: atiopencl.cpp atiopencl.hpp
+ $(CXX) $(CXXFLAGS) -c atiopencl.cpp
diff --git a/samples/multi_thread/Makefile b/samples/multi_thread/Makefile
new file mode 100644
index 0000000..48f9b10
--- /dev/null
+++ b/samples/multi_thread/Makefile
@@ -0,0 +1,29 @@
+# This should work on Linux. Modify as needed for other platforms.
+
+BOINC_DIR = ../..
+BOINC_API_DIR = $(BOINC_DIR)/api
+BOINC_LIB_DIR = $(BOINC_DIR)/lib
+
+CXXFLAGS = -g \
+ -I$(BOINC_DIR) \
+ -I$(BOINC_LIB_DIR) \
+ -I$(BOINC_API_DIR) \
+ -L$(BOINC_API_DIR) \
+ -L$(BOINC_LIB_DIR) \
+ -L.
+
+PROGS = multi_thread
+
+all: $(PROGS)
+
+libstdc++.a:
+ ln -s `g++ -print-file-name=libstdc++.a`
+
+clean:
+ /bin/rm -f $(PROGS)
+
+distclean:
+ /bin/rm -f $(PROGS) *.o libstdc++.a
+
+multi_thread: multi_thread.o libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
+ $(CXX) $(CXXFLAGS) -o multi_thread multi_thread.o libstdc++.a -pthread -lboinc_api -lboinc
diff --git a/samples/nvcuda/Makefile_mac b/samples/nvcuda/Makefile
similarity index 61%
copy from samples/nvcuda/Makefile_mac
copy to samples/nvcuda/Makefile
index f02eb7e..aadf9db 100644
--- a/samples/nvcuda/Makefile_mac
+++ b/samples/nvcuda/Makefile
@@ -1,13 +1,13 @@
-# makefile for cuda BOINC example application on Macintosh.
+# makefile for cuda BOINC example application on Linux.
# Add source files here
-EXECUTABLE := example_app_nvcuda_mac
+EXECUTABLE := example_app_nvcuda
# Cuda source files (compiled with cudacc)
CUFILES := cuda_kernel.cu
# C/C++ source files (compiled with gcc / c++)
-CCFILES := cuda.cpp \
+CCFILES := cuda.cpp\
################################################################################
# Rules and targets
-include common_mac.mk
\ No newline at end of file
+include common.mk
diff --git a/samples/nvopencl/Makefile_mac b/samples/nvopencl/Makefile
similarity index 50%
copy from samples/nvopencl/Makefile_mac
copy to samples/nvopencl/Makefile
index 321ebba..64fa59a 100644
--- a/samples/nvopencl/Makefile_mac
+++ b/samples/nvopencl/Makefile
@@ -1,11 +1,13 @@
-# makefile for nvopencl BOINC example application on Macintosh.
+# makefile for nvopencl BOINC example application on Linux.
# Add source files here
-EXECUTABLE := example_app_nvopencl_mac
+EXECUTABLE := example_app_nvopencl
# C/C++ source files (compiled with gcc / c++)
-CCFILES := nvopencl.cpp \
+CCFILES := nvopencl.cpp
################################################################################
# Rules and targets
-include common_opencl_mac.mk
+include common_opencl.mk
+
+
diff --git a/samples/sleeper/Makefile b/samples/sleeper/Makefile
new file mode 100644
index 0000000..13492ec
--- /dev/null
+++ b/samples/sleeper/Makefile
@@ -0,0 +1,29 @@
+# This should work on Linux. Modify as needed for other platforms.
+
+BOINC_DIR = ../..
+BOINC_API_DIR = $(BOINC_DIR)/api
+BOINC_LIB_DIR = $(BOINC_DIR)/lib
+
+CXXFLAGS = -g \
+ -I$(BOINC_DIR) \
+ -I$(BOINC_LIB_DIR) \
+ -I$(BOINC_API_DIR) \
+ -L$(BOINC_API_DIR) \
+ -L$(BOINC_LIB_DIR) \
+ -L.
+
+PROGS = sleeper
+
+all: $(PROGS)
+
+libstdc++.a:
+ ln -s `g++ -print-file-name=libstdc++.a`
+
+clean:
+ rm $(PROGS)
+
+distclean:
+ /bin/rm -f $(PROGS) *.o libstdc++.a
+
+sleeper: sleeper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
+ g++ $(CXXFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
diff --git a/samples/vboxwrapper/Makefile b/samples/vboxwrapper/Makefile
new file mode 100644
index 0000000..e0b533b
--- /dev/null
+++ b/samples/vboxwrapper/Makefile
@@ -0,0 +1,36 @@
+# This should work on Linux. Modify as needed for other platforms.
+
+# Change the following to match your installation
+BOINC_DIR = ../..
+BOINC_API_DIR = $(BOINC_DIR)/api
+BOINC_LIB_DIR = $(BOINC_DIR)/lib
+
+CXXFLAGS = -g \
+ -Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \
+ -I$(BOINC_DIR) \
+ -I$(BOINC_LIB_DIR) \
+ -I$(BOINC_API_DIR) \
+ -L$(BOINC_API_DIR) \
+ -L$(BOINC_LIB_DIR) \
+ -L.
+
+PROGS = vboxwrapper
+
+all: $(PROGS)
+
+libstdc++.a:
+ ln -s `g++ -print-file-name=libstdc++.a`
+
+clean:
+ rm $(PROGS) *.o
+
+distclean:
+ /bin/rm -f $(PROGS) *.o libstdc++.a
+
+vbox.o: vbox.cpp
+ g++ $(CXXFLAGS) -c vbox.cpp
+vm.o: vm.cpp
+ g++ $(CXXFLAGS) -c vm.cpp
+
+vboxwrapper: vboxwrapper.o vbox.o vm.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
+ g++ $(CXXFLAGS) -o vboxwrapper vboxwrapper.o vbox.o vm.o libstdc++.a -pthread -lboinc_api -lboinc
diff --git a/samples/worker/Makefile b/samples/worker/Makefile
new file mode 100644
index 0000000..4abe4d9
--- /dev/null
+++ b/samples/worker/Makefile
@@ -0,0 +1,14 @@
+CXXFLAGS = -g
+
+PROGS = worker
+
+all: $(PROGS)
+
+clean:
+ rm $(PROGS)
+
+distclean:
+ rm $(PROGS)
+
+worker: worker.o
+ g++ $(CXXFLAGS) -o worker worker.o
diff --git a/samples/wrapper/Makefile b/samples/wrapper/Makefile
new file mode 100644
index 0000000..0180006
--- /dev/null
+++ b/samples/wrapper/Makefile
@@ -0,0 +1,31 @@
+# This should work on Linux. Modify as needed for other platforms.
+
+# Change the following to match your installation
+BOINC_DIR = ../..
+BOINC_API_DIR = $(BOINC_DIR)/api
+BOINC_LIB_DIR = $(BOINC_DIR)/lib
+
+CXXFLAGS = -g \
+ -Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \
+ -I$(BOINC_DIR) \
+ -I$(BOINC_LIB_DIR) \
+ -I$(BOINC_API_DIR) \
+ -L$(BOINC_API_DIR) \
+ -L$(BOINC_LIB_DIR) \
+ -L.
+
+PROGS = wrapper
+
+all: $(PROGS)
+
+libstdc++.a:
+ ln -s `g++ -print-file-name=libstdc++.a`
+
+clean:
+ rm $(PROGS) *.o
+
+distclean:
+ /bin/rm -f $(PROGS) *.o libstdc++.a
+
+wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
+ g++ $(CXXFLAGS) -o wrapper wrapper.o libstdc++.a -pthread -lboinc_api -lboinc
diff --git a/samples/wrappture/Makefile b/samples/wrappture/Makefile
new file mode 100644
index 0000000..204d119
--- /dev/null
+++ b/samples/wrappture/Makefile
@@ -0,0 +1,39 @@
+# This should work on Linux. Modify as needed for other platforms.
+
+# Change the following to match your installation
+BOINC_DIR = ../..
+BOINC_API_DIR = $(BOINC_DIR)/api
+BOINC_LIB_DIR = $(BOINC_DIR)/lib
+RAPPTURE_DIR = /home/boincadm/rappture/rappture/src/core
+
+CXXFLAGS = -g \
+ -I$(BOINC_DIR) \
+ -I$(BOINC_LIB_DIR) \
+ -I$(BOINC_API_DIR) \
+ -I$(RAPPTURE_DIR) \
+ -L$(BOINC_API_DIR) \
+ -L$(BOINC_LIB_DIR) \
+ -L$(RAPPTURE_DIR) \
+ -L.
+
+PROGS = wrappture_example fermi
+
+all: $(PROGS)
+
+libstdc++.a:
+ ln -s `g++ -print-file-name=libstdc++.a`
+
+clean:
+ rm $(PROGS) *.o
+
+distclean:
+ /bin/rm -f $(PROGS) *.o libstdc++.a
+
+wrappture.o: wrappture.cpp
+ g++ $(CXXFLAGS) -c -o wrappture.o wrappture.cpp
+
+wrappture_example: wrappture.o wrappture_example.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(RAPPTURE_DIR)/librappture.a
+ g++ $(CXXFLAGS) -o wrappture_example wrappture_example.o wrappture.o $(RAPPTURE_DIR)/librappture.a libstdc++.a -pthread -lboinc_api -lboinc -lexpat -lz
+
+fermi: fermi.cpp
+ g++ $(CSSFLAGS) -o fermi fermi.cpp
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list