[chronojump] MakeFile.win32 compiles. But not installs



commit 87eb13f4f402c40436949e46c02f431c4c396c4c
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Mar 25 13:46:58 2011 +0100

    MakeFile.win32 compiles. But not installs

 Makefile.win32                             |   29 +++++++++++++++++++-----
 build/windows_bundle/build/howto_build.txt |   33 +++++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.win32 b/Makefile.win32
index 1d12d99..6a0c203 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -3,7 +3,8 @@ MONO_INSTALL_PATH=/c/Mono
 MONO = $(MONO_INSTALL_PATH)/bin/mono.exe
 MKBUNDLE = $(MONO_INSTALL_PATH)/lib/mono/2.0/mkbundle.exe
 GTK = $(MONO_INSTALL_PATH)
-GST = c:\gstreamer.local
+#GST = c:\gstreamer.local
+GST = c:\gstreamer
 
 CC   = gcc.exe
 CSC = $(MONO_INSTALL_PATH)/bin/gmcs
@@ -62,7 +63,8 @@ LDFLAGS =  -shared -Wl -mno-cygwin -mms-bitfields  --export-all-symbols --enable
 
 
 #CesarPlayer
-CESARPLAYER=${BUILD_DIR}/CesarPlayer.dll
+#CESARPLAYER=${BUILD_DIR}/CesarPlayer.dll
+CESARPLAYER=chronojump/win32/build/CesarPlayer.dll
 CSC_CESARPLAYER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -unsafe
 	CESARPLAYER_COMPILE_TARGET = library
 
@@ -148,6 +150,7 @@ CHRONOJUMP_FILES = \
 	gui/dialogServerStats.cs\
  	gui/evaluator.cs\
  	gui/queryServer.cs\
+ 	gui/usefulObjects.cs\
 	statType.cs\
 	stats/main.cs\
 	stats/global.cs\
@@ -162,6 +165,9 @@ CHRONOJUMP_FILES = \
  	stats/fv.cs\
  	stats/potency.cs\
  	stats/rjAVGSD.cs\
+ 	stats/jumpSimpleSubtraction.cs\
+	stats/runSimple.cs\
+	stats/runIntervallic.cs\
 	stats/graphs/graphData.cs\
  	stats/graphs/graphROptions.cs\
  	stats/graphs/graphSerie.cs\
@@ -177,6 +183,9 @@ CHRONOJUMP_FILES = \
  	stats/graphs/fv.cs\
  	stats/graphs/potency.cs\
 	stats/graphs/rjAVGSD.cs\
+ 	stats/graphs/jumpSimpleSubtraction.cs\
+	stats/graphs/runSimple.cs\
+	stats/graphs/runIntervallic.cs\
 	sqlite/main.cs\
  	sqlite/preferences.cs\
  	sqlite/session.cs\
@@ -237,7 +246,6 @@ CHRONOJUMP_FILES = \
 	constants.cs\
  	report.cs\
  	updateProgressBar.cs\
- 	prepareEventGraphObjects.cs\
  	sport.cs\
  	log.cs\
  	serverPing.cs\
@@ -378,10 +386,12 @@ CHRONOJUMP_MINI_REFERENCES = \
 	-r:System
 
 .PHONY: all all-before all-after clean clean-custom
-
+
+
 all: all-before ${GMO_FILES} ${LIBCESARPLAYER} $(CHRONOJUMP) $(CHRONOJUMP_MINI) all-after
 
-install: $(LIBCESARPLAYER) ${MO_FILES} bundle
+Install: $(LIBCESARPLAYER) ${MO_FILES} bundle
+	cp $(LIBCESARPLAYER) "$(BIN_DIR)"
 
 clean: clean-custom
 	${RM} $(CHRONOJUMP) $(CHRONOJUMP_MINI) $(GMO_FILES) $(BUILD_DIR)/temp* $(BUILD_DIR)/logo.o
@@ -412,4 +422,11 @@ $(CHRONOJUMP): $(CESARPLAYER)
 	cd src && $(CSC) $(CSC_CHRONOJUMP_FLAGS) -out:../$(CHRONOJUMP) -target:$(CHRONOJUMP_COMPILE_TARGET) $(CHRONOJUMP_FILES) $(CHRONOJUMP_REFERENCES) $(CHRONOJUMP_RESOURCES)
 	
 $(CHRONOJUMP_MINI):
-	cd src && $(CSC) $(CSC_CHRONOJUMP_MINI_FLAGS) -out:../$(CHRONOJUMP_MINI) -target:$(CHRONOJUMP_MINI_COMPILE_TARGET) $(CHRONOJUMP_MINI_FILES) $(CHRONOJUMP_MINI_REFERENCES) 
+	cd src && $(CSC) $(CSC_CHRONOJUMP_MINI_FLAGS) -out:../$(CHRONOJUMP_MINI) -target:$(CHRONOJUMP_MINI_COMPILE_TARGET) $(CHRONOJUMP_MINI_FILES) $(CHRONOJUMP_MINI_REFERENCES)
+
+
+$(LIBCESARPLAYER): $(LINKOBJ)
+	$(CC) $(LDFLAGS) -o $(LIBCESARPLAYER) $(LINKOBJ) $(LIBS)
+
+$(CESARPLAYER):
+	cd CesarPlayer && $(CSC) $(CSC_CESARPLAYER_FLAGS) -out:/$(CESARPLAYER) -target:$(CESARPLAYER_COMPILE_TARGET) $(CESARPLAYER_FILES) $(CESARPLAYER_REFERENCES) $(CESARPLAYER_RESOURCES)
diff --git a/build/windows_bundle/build/howto_build.txt b/build/windows_bundle/build/howto_build.txt
index 5be7283..0e28137 100755
--- a/build/windows_bundle/build/howto_build.txt
+++ b/build/windows_bundle/build/howto_build.txt
@@ -1,9 +1,29 @@
+---------------
+New:
+read longomatch windows compiling guidelines
+http://git.gnome.org/browse/longomatch/tree/README
+
+note gstreamer sdk will need .net framework 2.0
+
+search glade-sharp.dll on windows mono installation
+cd /c/mono
+find . |grep glade-sharp.dll
+cp lib/mono/gac/glade-sharp/<<version>>/glade-sharp.dll /c/chronojump
+
+on MakeFile.win32 change this:
+CESARPLAYER=${BUILD_DIR}/CesarPlayer.dll
+to this:
+CESARPLAYER=chronojump/win32/CesarPlayer.dll
+---------------
+
+
 PRE
 1: install mingw (automated mingw installer, do minimal install)
 http://sourceforge.net/projects/mingw/files/
 2: install msys
 http://sourceforge.net/projects/mingw/files/
 3: install mono in a dir without spaces
+4: install innosetup
 
 In 'Makefile.win32'change MONO_INSTALL_PATH to the Mono installation folder (eg: MONO_INSTALL_PATH=/c/Mono-2.4)
 MONO HAS TO BE INSTALLED IN A PATH WIHTOUT SPACES
@@ -19,6 +39,8 @@ $cp AssemblyInfo.cs.in AssemblyInfo.cs
 
 On AssemblyInfo.cs and change: @PACKAGE_VERSION@ to eg: 0.9.3
 
+do it also in CesarPlayer
+
 $make -f Makefile.win32
 
 It compiles Chronojump and Chronojump_mini, creates the bundle and install it in the bin folder.
@@ -28,7 +50,16 @@ Chronojump and Chronojump_mini:
 $make -f Makefile.win32 clean
 $make -f Makefile.win32
 
-then with innosetup we can create the installer that is ok because installs the driver and puts the gtk_prefs on the "start" folder:
+put stuff in bundle:
+$make -f Makefile.win32 Install
+
+but:
+needs to move win32/bundle stuff 
+to windows_bundle
+
+
+Innosetup:
+create the installer that is ok because installs the driver and puts the gtk_prefs on the "start" folder:
 open chronojump_innosetup.iss on build folder
 change version AT TWO PLACES:
 -AppVerName



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]