[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libcvd-members] gvars3 gvars3/GUI_Widgets.h gvars3/GUI_non_read...
|
From: |
Gerhard Reitmayr |
|
Subject: |
[libcvd-members] gvars3 gvars3/GUI_Widgets.h gvars3/GUI_non_read... |
|
Date: |
Thu, 12 Jun 2008 10:58:44 +0000 |
CVSROOT: /cvsroot/libcvd
Module name: gvars3
Changes by: Gerhard Reitmayr <gerhard> 08/06/12 10:58:44
Modified files:
gvars3 : GUI_Widgets.h GUI_non_readline.h type_name.h
src : GStringUtil.cc GUI.cc GUI_Fltk2.cc
GUI_impl_headless.cc GUI_impl_noreadline.cc
GUI_non_readline.cc gvars3.cc
Added files:
build/vc2005 : gvars3.sln gvars3.vcproj
Log message:
build files and some fixes for Visual Studio 2005. there are two
projects in the solution, one that links against fltk 2.0 to provide a gui and
another one that just creates a headless library. all libraries are only static
ones (to avoid the dllexport/dllimport hassle) and linked against the static
runtime libs.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gvars3/gvars3/GUI_Widgets.h?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gvars3/gvars3/GUI_non_readline.h?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gvars3/gvars3/type_name.h?cvsroot=libcvd&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/GStringUtil.cc?cvsroot=libcvd&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/GUI.cc?cvsroot=libcvd&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/GUI_Fltk2.cc?cvsroot=libcvd&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/GUI_impl_headless.cc?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/GUI_impl_noreadline.cc?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/GUI_non_readline.cc?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/gvars3.cc?cvsroot=libcvd&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gvars3/build/vc2005/gvars3.sln?cvsroot=libcvd&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gvars3/build/vc2005/gvars3.vcproj?cvsroot=libcvd&rev=1.1
Patches:
Index: gvars3/GUI_Widgets.h
===================================================================
RCS file: /cvsroot/libcvd/gvars3/gvars3/GUI_Widgets.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gvars3/GUI_Widgets.h 20 Feb 2008 19:03:58 -0000 1.1
+++ gvars3/GUI_Widgets.h 12 Jun 2008 10:58:43 -0000 1.2
@@ -23,7 +23,6 @@
#define GVARS3_INC_GUI_WIDGETS_H
#include <gvars3/GUI.h>
-#include <pthread.h>
namespace GVars3
{
Index: gvars3/GUI_non_readline.h
===================================================================
RCS file: /cvsroot/libcvd/gvars3/gvars3/GUI_non_readline.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gvars3/GUI_non_readline.h 12 Feb 2008 19:38:17 -0000 1.1
+++ gvars3/GUI_non_readline.h 12 Jun 2008 10:58:43 -0000 1.2
@@ -24,6 +24,8 @@
#include <string>
+#include <pthread.h>
+
namespace GVars3
{
Index: gvars3/type_name.h
===================================================================
RCS file: /cvsroot/libcvd/gvars3/gvars3/type_name.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gvars3/type_name.h 9 May 2006 13:27:55 -0000 1.3
+++ gvars3/type_name.h 12 Jun 2008 10:58:43 -0000 1.4
@@ -29,9 +29,15 @@
template <class T> std::string type_name()
{
+#ifdef WIN32
+ static std::string funcname = std::string(__FUNCSIG__);
+ static std::string::size_type begin = funcname.find("type_name<")+10;
+ static std::string name = funcname.substr(begin, funcname.rfind(">") -
begin);
+#else
static std::string funcname = std::string(__PRETTY_FUNCTION__);
static std::string bname = funcname.substr(funcname.rfind(" = ")+3);
static std::string name = bname.substr(0, bname.length()-1);
+#endif
return name;
}
Index: src/GStringUtil.cc
===================================================================
RCS file: /cvsroot/libcvd/gvars3/src/GStringUtil.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/GStringUtil.cc 25 Jul 2007 21:19:53 -0000 1.3
+++ src/GStringUtil.cc 12 Jun 2008 10:58:43 -0000 1.4
@@ -33,7 +33,7 @@
int q=0;
- for(int n=0; n < s.size(); n++)
+ for(string::size_type n=0; n < s.size(); n++)
{
if(s[n] == '"')
q = !q;
@@ -51,8 +51,8 @@
vector<string> ChopAndUnquoteString(string s)
{
vector<string> v;
- int nPos=0;
- int nLength = s.length();
+ string::size_type nPos=0;
+ string::size_type nLength = s.length();
while(1)
{
string sTarget;
Index: src/GUI.cc
===================================================================
RCS file: /cvsroot/libcvd/gvars3/src/GUI.cc,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/GUI.cc 28 May 2008 16:42:52 -0000 1.28
+++ src/GUI.cc 12 Jun 2008 10:58:44 -0000 1.29
@@ -23,13 +23,9 @@
#include "src/GUI_impl.h"
#include "gvars3/GStringUtil.h"
-#include <pthread.h>
-
#include <cctype>
#include <sstream>
#include <fstream>
-#include <unistd.h>
-#include <sys/wait.h>
#include <stdlib.h>
#include <algorithm>
@@ -173,7 +169,7 @@
void GUI_impl::UnRegisterCommand(string sCommandName, void* thisptr)
{
CallbackVector &cbv = mmCallBackMap[sCommandName];
- for(int i = cbv.size() - 1; i>=0; i--)
+ for(size_t i = cbv.size() - 1; i>=0; i--)
if(cbv[i].thisptr == thisptr)
cbv.erase(cbv.begin() + i);
};
@@ -227,7 +223,7 @@
string buffer;
while (getline(is, buffer)) {
// Lines ending with '\' are taken as continuing on the next line.
- while(buffer[buffer.length() - 1] == '\\') {
+ while(!buffer.empty() && buffer[buffer.length() - 1] == '\\') {
string buffer2;
if (! getline(is, buffer2))
break;
@@ -515,7 +511,7 @@
{
string s;
s = "";
- for(int i=1;i<v.size();i++)
+ for(size_t i=1;i<v.size();i++)
s = s + " " + v[i];
p->ParseLine(s);
}
@@ -545,7 +541,7 @@
{
string s;
s = "";
- for(int i=1;i<v.size();i++)
+ for(size_t i=1;i<v.size();i++)
s = s + " " + v[i];
p->ParseLine(s);
}
@@ -576,7 +572,7 @@
{
string s;
s = "";
- for(int i=2;i<v.size();i++)
+ for(size_t i=2;i<v.size();i++)
s = s + " " + v[i];
p->ParseLine(s);
}
@@ -688,7 +684,7 @@
if(vs.size() != 1)
{
cout << "? GUI_impl Internal " << sCommand << " command syntax:
runqueue queue-name " << endl;
- int nQueues = pGUI->mmQueues.size();
+ size_t nQueues = pGUI->mmQueues.size();
cout << " Currently there are " << nQueues << " queues registered." <<
endl;
if(nQueues > 0)
@@ -704,7 +700,7 @@
}
string &sQueueName = vs[0];
vector<string> &vQueue = pGUI->mmQueues[sQueueName];
- for(int i=0; i<vQueue.size(); i++)
+ for(size_t i=0; i<vQueue.size(); i++)
pGUI->ParseLine(vQueue[i]);
if(sCommand=="runqueue")
vQueue.clear(); // do not clear the queue if the command was
runqueue_noclear!
Index: src/GUI_Fltk2.cc
===================================================================
RCS file: /cvsroot/libcvd/gvars3/src/GUI_Fltk2.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/GUI_Fltk2.cc 20 Feb 2008 19:03:59 -0000 1.10
+++ src/GUI_Fltk2.cc 12 Jun 2008 10:58:44 -0000 1.11
@@ -27,7 +27,11 @@
#include <vector>
#include <string.h>
#include <sstream>
+
+#ifndef WIN32
+// for usleep
#include <unistd.h>
+#endif
#include <fltk/run.h>
#include <fltk/Window.h>
@@ -42,6 +46,10 @@
#define POLL_UPDATE 1
+#ifdef WIN32
+#undef AddMonitor
+#endif
+
using namespace std;
namespace GVars3
{
@@ -75,11 +83,13 @@
{
fltk::lock();
fltk::run();
- fltk::check();
fltk::unlock();
//If no windows are present, sleep and start again
+#ifdef WIN32
+ Sleep(10);
+#else
usleep(100000);
-
+#endif
}
}
@@ -573,7 +583,7 @@
};
-void GUI_Fltk2::AddMonitor(string cmd, string args)
+void GUI_Fltk2::AddMonitor(std::string cmd, std::string args)
{
string win_name = remove_suffix(cmd, ".AddMonitor");
Index: src/GUI_impl_headless.cc
===================================================================
RCS file: /cvsroot/libcvd/gvars3/src/GUI_impl_headless.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/GUI_impl_headless.cc 20 Mar 2008 02:09:15 -0000 1.1
+++ src/GUI_impl_headless.cc 12 Jun 2008 10:58:44 -0000 1.2
@@ -2,14 +2,6 @@
#include "src/GUI_impl.h"
#include "gvars3/GStringUtil.h"
-#include <cctype>
-#include <sstream>
-#include <fstream>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#include <algorithm>
-
using namespace std;
namespace GVars3
Index: src/GUI_impl_noreadline.cc
===================================================================
RCS file: /cvsroot/libcvd/gvars3/src/GUI_impl_noreadline.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/GUI_impl_noreadline.cc 20 Mar 2008 02:09:15 -0000 1.1
+++ src/GUI_impl_noreadline.cc 12 Jun 2008 10:58:44 -0000 1.2
@@ -9,8 +9,6 @@
#include <cctype>
#include <sstream>
#include <fstream>
-#include <unistd.h>
-#include <sys/wait.h>
#include <stdlib.h>
#include <algorithm>
Index: src/GUI_non_readline.cc
===================================================================
RCS file: /cvsroot/libcvd/gvars3/src/GUI_non_readline.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/GUI_non_readline.cc 12 Feb 2008 19:38:17 -0000 1.1
+++ src/GUI_non_readline.cc 12 Jun 2008 10:58:44 -0000 1.2
@@ -24,7 +24,6 @@
#include "gvars3/GUI_non_readline.h"
#include <iostream>
#include <pthread.h>
-#include <poll.h>
using namespace std;
Index: src/gvars3.cc
===================================================================
RCS file: /cvsroot/libcvd/gvars3/src/gvars3.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/gvars3.cc 11 Feb 2007 00:09:14 -0000 1.10
+++ src/gvars3.cc 12 Jun 2008 10:58:44 -0000 1.11
@@ -22,7 +22,16 @@
#include "gvars3/gvars3.h"
#include <vector>
#include <algorithm>
+
+#ifndef WIN32
#include <fnmatch.h>
+#else
+// FIXME: empty dummy implementation for now
+int fnmatch(const char *, const char *, int ){
+ return -1;
+}
+#define FNM_CASEFOLD 0
+#endif
using namespace std;
using namespace TooN;
Index: build/vc2005/gvars3.sln
===================================================================
RCS file: build/vc2005/gvars3.sln
diff -N build/vc2005/gvars3.sln
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ build/vc2005/gvars3.sln 12 Jun 2008 10:58:44 -0000 1.1
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvars3", "gvars3.vcproj",
"{81160AD9-2883-4EDD-AF09-35E3F4C9BA1E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvars3-headless",
"gvars3-headless.vcproj", "{30D8E485-EE60-4E92-ABEA-50C628FBCE59}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {81160AD9-2883-4EDD-AF09-35E3F4C9BA1E}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {81160AD9-2883-4EDD-AF09-35E3F4C9BA1E}.Debug|Win32.Build.0 =
Debug|Win32
+ {81160AD9-2883-4EDD-AF09-35E3F4C9BA1E}.Release|Win32.ActiveCfg
= Release|Win32
+ {81160AD9-2883-4EDD-AF09-35E3F4C9BA1E}.Release|Win32.Build.0 =
Release|Win32
+ {30D8E485-EE60-4E92-ABEA-50C628FBCE59}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {30D8E485-EE60-4E92-ABEA-50C628FBCE59}.Debug|Win32.Build.0 =
Debug|Win32
+ {30D8E485-EE60-4E92-ABEA-50C628FBCE59}.Release|Win32.ActiveCfg
= Release|Win32
+ {30D8E485-EE60-4E92-ABEA-50C628FBCE59}.Release|Win32.Build.0 =
Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Index: build/vc2005/gvars3.vcproj
===================================================================
RCS file: build/vc2005/gvars3.vcproj
diff -N build/vc2005/gvars3.vcproj
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ build/vc2005/gvars3.vcproj 12 Jun 2008 10:58:44 -0000 1.1
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="gvars3"
+ ProjectGUID="{81160AD9-2883-4EDD-AF09-35E3F4C9BA1E}"
+ RootNamespace="gvars3"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\Pre-built.2\include;..\..\..\fltk-2.0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\$(ProjectName)d.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="2"
+ FavorSizeOrSpeed="1"
+
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\Pre-built.2\include;..\..\..\fltk-2.0"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\$(ProjectName).lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\src\GStringUtil.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\GUI.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\GUI_Fltk2.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\GUI_impl_noreadline.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\GUI_non_readline.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\gvars2.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\gvars3.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\inst.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\serialize.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\..\gvars3\GStringUtil.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gvars3\GUI.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gvars3\GUI_Fltk2.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\GUI_impl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gvars3\gui_non_readline.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gvars3\gui_widgets.h"
+ >
+ </File>
+ <File
+
RelativePath="..\..\gvars3\gv3_implementation.hh"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gvars3\gvars3.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gvars3\instances.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gvars3\serialize.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gvars3\type_name.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ <File
+ RelativePath=".\ReadMe.txt"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libcvd-members] gvars3 gvars3/GUI_Widgets.h gvars3/GUI_non_read...,
Gerhard Reitmayr <=