rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Moved version header to base and it now uses VERSION macro 

from config.h if available (which means version is now a
string, not three integers).  Changed version to 1.0.0 and
protocol version to 1.0.  And added MAINTAINERCLEANFILES
to makefiles to remove generated files.
This commit is contained in:
crs 2002-07-31 16:57:26 +00:00
parent 8c1f5f623b
commit fae797e220
19 changed files with 105 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile.am
View File

@ -2,14 +2,28 @@
NULL = NULL =
DEPTH = . DEPTH = .
EXTRA_DIST = \ SUBDIRS = \
all.dsp \ lib \
synergy.dsw \ cmd \
doc/doxygen.cfg \
examples/synergy.conf \
$(NULL) $(NULL)
SUBDIRS = \ EXTRA_DIST = \
lib \ all.dsp \
cmd \ synergy.dsw \
doc/doxygen.cfg \
examples/synergy.conf \
$(NULL)
MAINTAINERCLEANFILES = \
Makefile.in \
aclocal.m4 \
config.h \
config.h.in \
config.guess \
config.log \
config.status \
config.sub \
configure \
stamp-h.in \
stamp-h1 \
$(NULL) $(NULL)

8
cmd/Makefile.am
View File

@ -2,8 +2,14 @@
NULL = NULL =
DEPTH = .. DEPTH = ..
EXTRA_DIST =
SUBDIRS = \ SUBDIRS = \
synergy \ synergy \
synergyd \ synergyd \
$(NULL) $(NULL)
EXTRA_DIST = \
$(NULL)
MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)

12
cmd/synergy/Makefile.am
View File

@ -2,10 +2,14 @@
NULL = NULL =
DEPTH = ../.. DEPTH = ../..
EXTRA_DIST = \ EXTRA_DIST = \
synergy.dsp \ synergy.dsp \
synergy.rc \ synergy.rc \
resource.h \ resource.h \
$(NULL)
MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL) $(NULL)
bin_PROGRAMS = synergy bin_PROGRAMS = synergy

6
cmd/synergy/synergy.cpp
View File

@ -218,12 +218,10 @@ void
version() version()
{ {
log((CLOG_PRINT log((CLOG_PRINT
"%s %d.%d.%d, protocol version %d.%d\n" "%s %s, protocol version %d.%d\n"
"%s", "%s",
pname, pname,
kMajorVersion, kVersion,
kMinorVersion,
kReleaseVersion,
kProtocolMajorVersion, kProtocolMajorVersion,
kProtocolMinorVersion, kProtocolMinorVersion,
kCopyright)); kCopyright));

12
cmd/synergyd/Makefile.am
View File

@ -2,10 +2,14 @@
NULL = NULL =
DEPTH = ../.. DEPTH = ../..
EXTRA_DIST = \ EXTRA_DIST = \
synergyd.dsp \ synergyd.dsp \
synergyd.rc \ synergyd.rc \
resource.h \ resource.h \
$(NULL)
MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL) $(NULL)
bin_PROGRAMS = synergyd bin_PROGRAMS = synergyd

6
cmd/synergyd/synergyd.cpp
View File

@ -242,12 +242,10 @@ void
version() version()
{ {
log((CLOG_PRINT log((CLOG_PRINT
"%s %d.%d.%d, protocol version %d.%d\n" "%s %s, protocol version %d.%d\n"
"%s", "%s",
pname, pname,
kMajorVersion, kVersion,
kMinorVersion,
kReleaseVersion,
kProtocolMajorVersion, kProtocolMajorVersion,
kProtocolMinorVersion, kProtocolMinorVersion,
kCopyright)); kCopyright));

2
configure.in
View File

@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(lib/base/common.h) AC_INIT(lib/base/common.h)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE(synergy, 0.5) AM_INIT_AUTOMAKE(synergy, 1.0.0)
dnl information on the package dnl information on the package

8
lib/Makefile.am
View File

@ -2,7 +2,6 @@
NULL = NULL =
DEPTH = .. DEPTH = ..
EXTRA_DIST =
SUBDIRS = \ SUBDIRS = \
base \ base \
mt \ mt \
@ -14,3 +13,10 @@ SUBDIRS = \
client \ client \
server \ server \
$(NULL) $(NULL)
EXTRA_DIST = \
$(NULL)
MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)

5
lib/base/Makefile.am
View File

@ -6,6 +6,10 @@ EXTRA_DIST = \
base.dsp \ base.dsp \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)
noinst_LIBRARIES = libbase.a noinst_LIBRARIES = libbase.a
libbase_a_SOURCES = \ libbase_a_SOURCES = \
CFunctionJob.cpp \ CFunctionJob.cpp \
@ -23,6 +27,7 @@ libbase_a_SOURCES = \
IInterface.h \ IInterface.h \
IJob.h \ IJob.h \
TMethodJob.h \ TMethodJob.h \
Version.h \
XBase.h \ XBase.h \
common.h \ common.h \
stdfstream.h \ stdfstream.h \

11
lib/synergy/Version.h → lib/base/Version.h
View File

@ -1,7 +1,12 @@
#ifndef VERSION_H #ifndef VERSION_H
#define VERSION_H #define VERSION_H
#include "BasicTypes.h" #include "common.h"
// set version macro if not set yet
#if !defined(VERSION)
# define VERSION "1.0.0"
#endif
// important strings // important strings
static const char* kCopyright = "Copyright (C) 2002 Chris Schoeneman"; static const char* kCopyright = "Copyright (C) 2002 Chris Schoeneman";
@ -10,9 +15,7 @@ static const char* kWebsite = "";
// build version. follows linux kernel style: an even minor number implies // build version. follows linux kernel style: an even minor number implies
// a release version, odd implies development version. // a release version, odd implies development version.
static const SInt16 kMajorVersion = 0; static const char* kVersion = VERSION;
static const SInt16 kMinorVersion = 9;
static const SInt16 kReleaseVersion = 7;
// exit codes // exit codes
static const int kExitSuccess = 0; // successful completion static const int kExitSuccess = 0; // successful completion

4
lib/client/Makefile.am
View File

@ -8,6 +8,10 @@ EXTRA_DIST = \
CMSWindowsSecondaryScreen.h \ CMSWindowsSecondaryScreen.h \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)
noinst_LIBRARIES = libclient.a noinst_LIBRARIES = libclient.a
libclient_a_SOURCES = \ libclient_a_SOURCES = \
CClient.cpp \ CClient.cpp \

4
lib/http/Makefile.am
View File

@ -6,6 +6,10 @@ EXTRA_DIST = \
http.dsp \ http.dsp \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)
noinst_LIBRARIES = libhttp.a noinst_LIBRARIES = libhttp.a
libhttp_a_SOURCES = \ libhttp_a_SOURCES = \
CHTTPProtocol.cpp \ CHTTPProtocol.cpp \

8
lib/io/Makefile.am
View File

@ -2,8 +2,12 @@
NULL = NULL =
DEPTH = ../.. DEPTH = ../..
EXTRA_DIST = \ EXTRA_DIST = \
io.dsp \ io.dsp \
$(NULL)
MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL) $(NULL)
noinst_LIBRARIES = libio.a noinst_LIBRARIES = libio.a

4
lib/mt/Makefile.am
View File

@ -6,6 +6,10 @@ EXTRA_DIST = \
mt.dsp \ mt.dsp \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)
noinst_LIBRARIES = libmt.a noinst_LIBRARIES = libmt.a
libmt_a_SOURCES = \ libmt_a_SOURCES = \
CLock.cpp \ CLock.cpp \

4
lib/net/Makefile.am
View File

@ -6,6 +6,10 @@ EXTRA_DIST = \
net.dsp \ net.dsp \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)
noinst_LIBRARIES = libnet.a noinst_LIBRARIES = libnet.a
libnet_a_SOURCES = \ libnet_a_SOURCES = \
CNetwork.cpp \ CNetwork.cpp \

4
lib/platform/Makefile.am
View File

@ -25,6 +25,10 @@ EXTRA_DIST = \
IMSWindowsScreenEventHandler.h \ IMSWindowsScreenEventHandler.h \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)
noinst_LIBRARIES = libplatform.a noinst_LIBRARIES = libplatform.a
libplatform_a_SOURCES = \ libplatform_a_SOURCES = \
CPlatform.cpp \ CPlatform.cpp \

4
lib/server/Makefile.am
View File

@ -8,6 +8,10 @@ EXTRA_DIST = \
CMSWindowsPrimaryScreen.h \ CMSWindowsPrimaryScreen.h \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)
noinst_LIBRARIES = libserver.a noinst_LIBRARIES = libserver.a
libserver_a_SOURCES = \ libserver_a_SOURCES = \
CClientProxy.cpp \ CClientProxy.cpp \

5
lib/synergy/Makefile.am
View File

@ -6,6 +6,10 @@ EXTRA_DIST = \
libsynergy.dsp \ libsynergy.dsp \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)
noinst_LIBRARIES = libsynergy.a noinst_LIBRARIES = libsynergy.a
libsynergy_a_SOURCES = \ libsynergy_a_SOURCES = \
CInputPacketStream.cpp \ CInputPacketStream.cpp \
@ -30,7 +34,6 @@ libsynergy_a_SOURCES = \
KeyTypes.h \ KeyTypes.h \
MouseTypes.h \ MouseTypes.h \
ProtocolTypes.h \ ProtocolTypes.h \
Version.h \
XScreen.h \ XScreen.h \
XSynergy.h \ XSynergy.h \
$(NULL) $(NULL)

4
lib/synergy/ProtocolTypes.h
View File

@ -4,8 +4,8 @@
#include "BasicTypes.h" #include "BasicTypes.h"
// protocol version number // protocol version number
static const SInt16 kProtocolMajorVersion = 0; static const SInt16 kProtocolMajorVersion = 1;
static const SInt16 kProtocolMinorVersion = 7; static const SInt16 kProtocolMinorVersion = 0;
// default contact port number // default contact port number
static const UInt16 kDefaultPort = 24800; static const UInt16 kDefaultPort = 24800;