[chronojump] Working on windows (thanks to Andoni)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Working on windows (thanks to Andoni)
- Date: Thu, 14 Apr 2011 16:51:32 +0000 (UTC)
commit c4bf6ee4180299c5d2370404fcc2cf54a9ff9ee0
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Apr 14 18:51:04 2011 +0200
Working on windows (thanks to Andoni)
Makefile.win32 | 11 ++++++++
.../windows_bundle/build/chronojump_innosetup.iss | 6 ++--
build/windows_bundle/build/howto_build.txt | 3 +-
build/windows_bundle/drivers/CDM20802_Setup.exe | 25 ++++++++++++++++++++
src/chronojump.cs | 9 +++++++
5 files changed, 50 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.win32 b/Makefile.win32
index c9101a0..bf63420 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -344,9 +344,20 @@ CHRONOJUMP_RESOURCES = \
-resource:../images/stock_delete.png,stock_delete.png \
-resource:../images/chronojump_icon.png,chronojump_icon.png \
-resource:../images/chronojump_icon_graph.png,chronojump_icon_graph.png \
+ -resource:../images/stock_right.png,stock_right.png \
+ -resource:../images/stock_right_left.png,stock_right_left.png \
+ -resource:../images/stock_up.png,stock_up.png \
+ -resource:../images/stock_up_down.png,stock_up_down.png \
+ -resource:../images/reaction_time_menu.png,reaction_time_menu.png \
+ -resource:../images/pulse_menu.png,pulse_menu.png \
+ -resource:../images/multichronopic_menu.png,multichronopic_menu.png \
-resource:../images/gtk-zoom-fit.png,gtk-zoom-fit.png \
-resource:../images/gtk-zoom-in.png,gtk-zoom-in.png \
-resource:../images/gtk-zoom-in-with-text.png,gtk-zoom-in-with-text.png \
+ -resource:../images/gtk-new-1.png,gtk-new-1.png \
+ -resource:../images/gtk-new-plus.png,gtk-new-plus.png \
+ -resource:../images/gtk-open-1.png,gtk-open-1.png \
+ -resource:../images/gtk-open-plus.png,gtk-open-plus.png \
-resource:../images/chronojump_320.png,chronojump_320.png \
-resource:../images/calendar.png,calendar.png \
-resource:../images/chronojump_logo.png,chronojump_logo.png \
diff --git a/build/windows_bundle/build/chronojump_innosetup.iss b/build/windows_bundle/build/chronojump_innosetup.iss
index f422e2c..bc68c7d 100755
--- a/build/windows_bundle/build/chronojump_innosetup.iss
+++ b/build/windows_bundle/build/chronojump_innosetup.iss
@@ -7,7 +7,7 @@
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{69EC15A7-5D66-4D24-A15B-1C23C0F621E0}
AppName=Chronojump
-AppVerName=Chronojump 0.9.2
+AppVerName=Chronojump 0.9.3
AppPublisher=Chronojump
AppPublisherURL=http://www.chronojump.org/
AppSupportURL=http://www.chronojump.org/
@@ -16,7 +16,7 @@ DefaultDirName={pf}\Chronojump
DefaultGroupName=Chronojump
LicenseFile=.\gpl-2.0.txt
OutputDir=.
-OutputBaseFilename=Chronojump-0.9.2
+OutputBaseFilename=Chronojump-0.9.3
SetupIconFile=.\chronojump_icon.ico
Compression=lzma
SolidCompression=yes
@@ -62,6 +62,6 @@ Name: "{group}\Chronojump Theme change - Cambiar tema"; Filename: "{app}\bin\gtk
Name: "{group}\{cm:UninstallProgram,Chronojump}"; Filename: "{uninstallexe}"
[Run]
-Filename: "{app}\drivers\CDM20600.exe";
+Filename: "{app}\drivers\CDM20802_Setup.exe";
Filename: "{app}\bin\Chronojump.exe"; Description: "{cm:LaunchProgram,ChronoJump}"; Flags: nowait postinstall skipifsilent
diff --git a/build/windows_bundle/build/howto_build.txt b/build/windows_bundle/build/howto_build.txt
index 9487329..1c37da0 100755
--- a/build/windows_bundle/build/howto_build.txt
+++ b/build/windows_bundle/build/howto_build.txt
@@ -51,7 +51,7 @@ $make -f Makefile.win32 clean
$make -f Makefile.win32
put stuff in bundle:
-$make -f Makefile.win32 Install
+$make -f Makefile.win32 install
but:
needs to move win32/bundle stuff
@@ -64,6 +64,7 @@ open chronojump_innosetup.iss on build folder
change version AT TWO PLACES:
-AppVerName
-OutputBaseFilename
+Change the driver name if new available
compile
diff --git a/build/windows_bundle/drivers/CDM20802_Setup.exe b/build/windows_bundle/drivers/CDM20802_Setup.exe
new file mode 100644
index 0000000..d497fb6
--- /dev/null
+++ b/build/windows_bundle/drivers/CDM20802_Setup.exe
@@ -0,0 +1,25 @@
+<html>
+
+<head>
+<meta http-equiv="Content-Language" content="en-gb">
+<meta name="GENERATOR" content="Microsoft FrontPage 12.0">
+<meta name="ProgId" content="FrontPage.Editor.Document">
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta http-equiv="REFRESH" content="5; URL = http://www.ftdichip.com">
+<title>FTDI Error 404 Page Not Found </title>
+</head>
+
+<body>
+
+<p><font face="Arial">
+<img border="0" src="Images/FTDI%20Logo.jpg" width="257" height="100"></font></p>
+<p> </p>
+<p><font face="Arial">This page does not exist. You will be redirected to the
+FTDI home page in 5 seconds.</font></p>
+<p><font face="Arial">If you are not redirected automatically, click on the link
+below.</font></p>
+<p><font face="Arial"><a href="http://www.ftdichip.com/">http://www.ftdichip.com</a></font></p>
+
+</body>
+
+</html>
diff --git a/src/chronojump.cs b/src/chronojump.cs
index fe03483..e7351ca 100644
--- a/src/chronojump.cs
+++ b/src/chronojump.cs
@@ -51,6 +51,7 @@ public class ChronoJump
string splashMessage = "";
bool creatingDB = false; //on creation and on update always refresh labels
bool updatingDB = false;
+ private static string baseDirectory;
public static void Main(string [] args)
@@ -69,6 +70,10 @@ public class ChronoJump
sw.AutoFlush = true;
*/
+ baseDirectory = System.IO.Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory,"../../");
+ if(Util.IsWindows())
+ Environment.SetEnvironmentVariable("GST_PLUGIN_PATH",RelativeToPrefix("lib\\gstreamer-0.10"));
+
//this call has to be done to chronojump.prg
//chronojump.prg createBlankDB
//this creates a blank database and exists.
@@ -91,6 +96,10 @@ public class ChronoJump
}
bool createdSplashWin = false;
+
+ public static string RelativeToPrefix(string relativePath) {
+ return System.IO.Path.Combine(baseDirectory, relativePath);
+ }
public ChronoJump (string [] args)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]