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:
parent
8c1f5f623b
commit
fae797e220
30
Makefile.am
30
Makefile.am
|
@ -2,14 +2,28 @@
|
|||
NULL =
|
||||
DEPTH = .
|
||||
|
||||
EXTRA_DIST = \
|
||||
all.dsp \
|
||||
synergy.dsw \
|
||||
doc/doxygen.cfg \
|
||||
examples/synergy.conf \
|
||||
SUBDIRS = \
|
||||
lib \
|
||||
cmd \
|
||||
$(NULL)
|
||||
|
||||
SUBDIRS = \
|
||||
lib \
|
||||
cmd \
|
||||
EXTRA_DIST = \
|
||||
all.dsp \
|
||||
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)
|
||||
|
|
|
@ -2,8 +2,14 @@
|
|||
NULL =
|
||||
DEPTH = ..
|
||||
|
||||
EXTRA_DIST =
|
||||
SUBDIRS = \
|
||||
synergy \
|
||||
synergyd \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
$(NULL)
|
||||
|
|
|
@ -2,10 +2,14 @@
|
|||
NULL =
|
||||
DEPTH = ../..
|
||||
|
||||
EXTRA_DIST = \
|
||||
synergy.dsp \
|
||||
synergy.rc \
|
||||
resource.h \
|
||||
EXTRA_DIST = \
|
||||
synergy.dsp \
|
||||
synergy.rc \
|
||||
resource.h \
|
||||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
$(NULL)
|
||||
|
||||
bin_PROGRAMS = synergy
|
||||
|
|
|
@ -218,12 +218,10 @@ void
|
|||
version()
|
||||
{
|
||||
log((CLOG_PRINT
|
||||
"%s %d.%d.%d, protocol version %d.%d\n"
|
||||
"%s %s, protocol version %d.%d\n"
|
||||
"%s",
|
||||
pname,
|
||||
kMajorVersion,
|
||||
kMinorVersion,
|
||||
kReleaseVersion,
|
||||
kVersion,
|
||||
kProtocolMajorVersion,
|
||||
kProtocolMinorVersion,
|
||||
kCopyright));
|
||||
|
|
|
@ -2,10 +2,14 @@
|
|||
NULL =
|
||||
DEPTH = ../..
|
||||
|
||||
EXTRA_DIST = \
|
||||
synergyd.dsp \
|
||||
synergyd.rc \
|
||||
resource.h \
|
||||
EXTRA_DIST = \
|
||||
synergyd.dsp \
|
||||
synergyd.rc \
|
||||
resource.h \
|
||||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
$(NULL)
|
||||
|
||||
bin_PROGRAMS = synergyd
|
||||
|
|
|
@ -242,12 +242,10 @@ void
|
|||
version()
|
||||
{
|
||||
log((CLOG_PRINT
|
||||
"%s %d.%d.%d, protocol version %d.%d\n"
|
||||
"%s %s, protocol version %d.%d\n"
|
||||
"%s",
|
||||
pname,
|
||||
kMajorVersion,
|
||||
kMinorVersion,
|
||||
kReleaseVersion,
|
||||
kVersion,
|
||||
kProtocolMajorVersion,
|
||||
kProtocolMinorVersion,
|
||||
kCopyright));
|
||||
|
|
|
@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
|
|||
AC_INIT(lib/base/common.h)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_AUX_DIR(config)
|
||||
AM_INIT_AUTOMAKE(synergy, 0.5)
|
||||
AM_INIT_AUTOMAKE(synergy, 1.0.0)
|
||||
|
||||
dnl information on the package
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
NULL =
|
||||
DEPTH = ..
|
||||
|
||||
EXTRA_DIST =
|
||||
SUBDIRS = \
|
||||
base \
|
||||
mt \
|
||||
|
@ -14,3 +13,10 @@ SUBDIRS = \
|
|||
client \
|
||||
server \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
$(NULL)
|
||||
|
|
|
@ -6,6 +6,10 @@ EXTRA_DIST = \
|
|||
base.dsp \
|
||||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
$(NULL)
|
||||
|
||||
noinst_LIBRARIES = libbase.a
|
||||
libbase_a_SOURCES = \
|
||||
CFunctionJob.cpp \
|
||||
|
@ -23,6 +27,7 @@ libbase_a_SOURCES = \
|
|||
IInterface.h \
|
||||
IJob.h \
|
||||
TMethodJob.h \
|
||||
Version.h \
|
||||
XBase.h \
|
||||
common.h \
|
||||
stdfstream.h \
|
||||
|
|
|
@ -1,7 +1,12 @@
|
|||
#ifndef 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
|
||||
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
|
||||
// a release version, odd implies development version.
|
||||
static const SInt16 kMajorVersion = 0;
|
||||
static const SInt16 kMinorVersion = 9;
|
||||
static const SInt16 kReleaseVersion = 7;
|
||||
static const char* kVersion = VERSION;
|
||||
|
||||
// exit codes
|
||||
static const int kExitSuccess = 0; // successful completion
|
|
@ -8,6 +8,10 @@ EXTRA_DIST = \
|
|||
CMSWindowsSecondaryScreen.h \
|
||||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
$(NULL)
|
||||
|
||||
noinst_LIBRARIES = libclient.a
|
||||
libclient_a_SOURCES = \
|
||||
CClient.cpp \
|
||||
|
|
|
@ -6,6 +6,10 @@ EXTRA_DIST = \
|
|||
http.dsp \
|
||||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
$(NULL)
|
||||
|
||||
noinst_LIBRARIES = libhttp.a
|
||||
libhttp_a_SOURCES = \
|
||||
CHTTPProtocol.cpp \
|
||||
|
|
|
@ -2,8 +2,12 @@
|
|||
NULL =
|
||||
DEPTH = ../..
|
||||
|
||||
EXTRA_DIST = \
|
||||
io.dsp \
|
||||
EXTRA_DIST = \
|
||||
io.dsp \
|
||||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
$(NULL)
|
||||
|
||||
noinst_LIBRARIES = libio.a
|
||||
|
|
|
@ -6,6 +6,10 @@ EXTRA_DIST = \
|
|||
mt.dsp \
|
||||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
$(NULL)
|
||||
|
||||
noinst_LIBRARIES = libmt.a
|
||||
libmt_a_SOURCES = \
|
||||
CLock.cpp \
|
||||
|
|
|
@ -6,6 +6,10 @@ EXTRA_DIST = \
|
|||
net.dsp \
|
||||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
$(NULL)
|
||||
|
||||
noinst_LIBRARIES = libnet.a
|
||||
libnet_a_SOURCES = \
|
||||
CNetwork.cpp \
|
||||
|
|
|
@ -25,6 +25,10 @@ EXTRA_DIST = \
|
|||
IMSWindowsScreenEventHandler.h \
|
||||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
$(NULL)
|
||||
|
||||
noinst_LIBRARIES = libplatform.a
|
||||
libplatform_a_SOURCES = \
|
||||
CPlatform.cpp \
|
||||
|
|
|
@ -8,6 +8,10 @@ EXTRA_DIST = \
|
|||
CMSWindowsPrimaryScreen.h \
|
||||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
$(NULL)
|
||||
|
||||
noinst_LIBRARIES = libserver.a
|
||||
libserver_a_SOURCES = \
|
||||
CClientProxy.cpp \
|
||||
|
|
|
@ -6,6 +6,10 @@ EXTRA_DIST = \
|
|||
libsynergy.dsp \
|
||||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
$(NULL)
|
||||
|
||||
noinst_LIBRARIES = libsynergy.a
|
||||
libsynergy_a_SOURCES = \
|
||||
CInputPacketStream.cpp \
|
||||
|
@ -30,7 +34,6 @@ libsynergy_a_SOURCES = \
|
|||
KeyTypes.h \
|
||||
MouseTypes.h \
|
||||
ProtocolTypes.h \
|
||||
Version.h \
|
||||
XScreen.h \
|
||||
XSynergy.h \
|
||||
$(NULL)
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
#include "BasicTypes.h"
|
||||
|
||||
// protocol version number
|
||||
static const SInt16 kProtocolMajorVersion = 0;
|
||||
static const SInt16 kProtocolMinorVersion = 7;
|
||||
static const SInt16 kProtocolMajorVersion = 1;
|
||||
static const SInt16 kProtocolMinorVersion = 0;
|
||||
|
||||
// default contact port number
|
||||
static const UInt16 kDefaultPort = 24800;
|
||||
|
|
Loading…
Reference in New Issue