Hi Hal, Sounds good. I think you should be able to use the .svn/entries to get the last update revision and then use svn diff (or diff) to see if local mods are done on top of it... So we do not get caught by surprise when something broke due to un-committed mod in the local directory
Thanks Eitan Zahavi Design Technology Director Mellanox Technologies LTD Tel:+972-4-9097208 Fax:+972-4-9593245 P.O. Box 586 Yokneam 20692 ISRAEL > -----Original Message----- > From: Hal Rosenstock [mailto:[EMAIL PROTECTED] > Sent: Tuesday, January 03, 2006 5:17 PM > To: Eitan Zahavi > Cc: [email protected] > Subject: RE: [PATCH] [TRIVIAL] OpenSM: Separate out OSM_VERSION > > On Tue, 2006-01-03 at 09:42, Eitan Zahavi wrote: > > Thanks. Can you elaborate for how that file " osm_svn_revision.h" will > > be updated? > > Is it going to be updated by the "autogen.sh" ? or by a checkin trigger? > > Neither; I'm planning to have it updated by the make when needed. > > -- Hal > > > > -----Original Message----- > > > From: Hal Rosenstock [mailto:[EMAIL PROTECTED] > > > Sent: Tuesday, January 03, 2006 2:25 PM > > > To: Eitan Zahavi > > > Cc: [email protected] > > > Subject: RE: [PATCH] [TRIVIAL] OpenSM: Separate out OSM_VERSION > > > > > > Hi Eitan, > > > > > > On Tue, 2006-01-03 at 06:55, Eitan Zahavi wrote: > > > > Hi Hal, > > > > > > > > This patch is fine with me and Yael, and Ofer. > > > > > > Thanks. > > > > > > > We will use some scripts to automatically update the version info > > with > > > > the "build name" and SVN version. We plan to do that for the > > > > osm_version.h as well as the configure.in files. This will happen > > when > > > > building a distribution of OpenSM code as part of the OpenIB > > > > distribution or standalone OpenSM drop. > > > > > > I will shortly have a patch along these lines which I will send to the > > > list. It creates a separate osm_svn_revision.h if > > > userspace/management/osm/.svn/entries is present. > > > > > > -- Hal > > > > > > > EZ > > > > Eitan Zahavi > > > > Design Technology Director > > > > Mellanox Technologies LTD > > > > Tel:+972-4-9097208 > > > > Fax:+972-4-9593245 > > > > P.O. Box 586 Yokneam 20692 ISRAEL > > > > > > > > > > > > > -----Original Message----- > > > > > From: Hal Rosenstock [mailto:[EMAIL PROTECTED] > > > > > Sent: Monday, January 02, 2006 4:41 PM > > > > > To: Yael Kalka; Eitan Zahavi > > > > > Cc: [email protected] > > > > > Subject: [PATCH] [TRIVIAL] OpenSM: Separate out OSM_VERSION > > > > > > > > > > OpenSM: Separate out OSM_VERSION so when changing only needed > > files > > > > are > > > > > recompiled rather than everything > > > > > > > > > > Signed-off-by: Hal Rosenstock <[EMAIL PROTECTED]> > > > > > > > > > > Index: osm/include/opensm/osm_version.h > > > > > > > =================================================================== > > > > > --- osm/include/opensm/osm_version.h (revision 0) > > > > > +++ osm/include/opensm/osm_version.h (revision 0) > > > > > @@ -0,0 +1,65 @@ > > > > > +/* > > > > > + * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved. > > > > > + * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights > > > > reserved. > > > > > + * Copyright (c) 1996-2003 Intel Corporation. All rights > > reserved. > > > > > + * > > > > > + * This software is available to you under a choice of one of two > > > > > + * licenses. You may choose to be licensed under the terms of > > the > > > > GNU > > > > > + * General Public License (GPL) Version 2, available from the > > file > > > > > + * COPYING in the main directory of this source tree, or the > > > > > + * OpenIB.org BSD license below: > > > > > + * > > > > > + * Redistribution and use in source and binary forms, with or > > > > > + * without modification, are permitted provided that the > > > > following > > > > > + * conditions are met: > > > > > + * > > > > > + * - Redistributions of source code must retain the above > > > > > + * copyright notice, this list of conditions and the > > following > > > > > + * disclaimer. > > > > > + * > > > > > + * - Redistributions in binary form must reproduce the above > > > > > + * copyright notice, this list of conditions and the > > following > > > > > + * disclaimer in the documentation and/or other materials > > > > > + * provided with the distribution. > > > > > + * > > > > > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY > > > > > KIND, > > > > > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE > > > > > WARRANTIES OF > > > > > + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > > > > > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR > > > COPYRIGHT > > > > > HOLDERS > > > > > + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > > > WHETHER > > > > > IN AN > > > > > + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT > OF > > > OR > > > > > IN > > > > > + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > DEALINGS > > > IN > > > > > THE > > > > > + * SOFTWARE. > > > > > + * > > > > > + * $Id$ > > > > > + */ > > > > > + > > > > > + > > > > > +#ifndef _OSM_VERSION_H_ > > > > > +#define _OSM_VERSION_H_ > > > > > + > > > > > +#ifdef __cplusplus > > > > > +# define BEGIN_C_DECLS extern "C" { > > > > > +# define END_C_DECLS } > > > > > +#else /* !__cplusplus */ > > > > > +# define BEGIN_C_DECLS > > > > > +# define END_C_DECLS > > > > > +#endif /* __cplusplus */ > > > > > + > > > > > +BEGIN_C_DECLS > > > > > + > > > > > +/****s* OpenSM: Base/OSM_VERSION > > > > > +* NAME > > > > > +* OSM_VERSION > > > > > +* > > > > > +* DESCRIPTION > > > > > +* The version string for OpenSM > > > > > +* > > > > > +* SYNOPSIS > > > > > +*/ > > > > > +#define OSM_VERSION "OpenSM Rev:openib-1.1.0" > > > > > +/********/ > > > > > + > > > > > +END_C_DECLS > > > > > + > > > > > +#endif /* _OSM_VERSION_H_ */ > > > > > > > > > > Property changes on: osm/include/opensm/osm_version.h > > > > > > > ___________________________________________________________________ > > > > > Name: svn:keywords > > > > > + Id > > > > > > > > > > Index: osm/include/opensm/osm_base.h > > > > > > > =================================================================== > > > > > --- osm/include/opensm/osm_base.h (revision 4686) > > > > > +++ osm/include/opensm/osm_base.h (working copy) > > > > > @@ -89,18 +89,6 @@ BEGIN_C_DECLS > > > > > * Steve King, Intel > > > > > * > > > > > *********/ > > > > > -/****s* OpenSM: Base/OSM_VERSION > > > > > -* NAME > > > > > -* OSM_VERSION > > > > > -* > > > > > -* DESCRIPTION > > > > > -* The version string for OpenSM > > > > > -* > > > > > -* SYNOPSIS > > > > > -*/ > > > > > -#define OSM_VERSION "OpenSM Rev:openib-1.1.0" > > > > > -/********/ > > > > > - > > > > > /****s* OpenSM: Base/OSM_DEFAULT_M_KEY > > > > > * NAME > > > > > * OSM_DEFAULT_M_KEY > > > > > Index: osm/opensm/osm_opensm.c > > > > > > > =================================================================== > > > > > --- osm/opensm/osm_opensm.c (revision 4686) > > > > > +++ osm/opensm/osm_opensm.c (working copy) > > > > > @@ -58,6 +58,7 @@ > > > > > #include <complib/cl_dispatcher.h> > > > > > #include <complib/cl_passivelock.h> > > > > > #include <vendor/osm_vendor_api.h> > > > > > +#include <opensm/osm_version.h> > > > > > #include <opensm/osm_base.h> > > > > > #include <opensm/osm_opensm.h> > > > > > #include <opensm/osm_log.h> > > > > > Index: osm/opensm/main.c > > > > > > > =================================================================== > > > > > --- osm/opensm/main.c (revision 4686) > > > > > +++ osm/opensm/main.c (working copy) > > > > > @@ -56,6 +56,7 @@ > > > > > #include <stdlib.h> > > > > > #include <getopt.h> > > > > > #include <unistd.h> > > > > > +#include <opensm/osm_version.h> > > > > > #include <opensm/osm_opensm.h> > > > > > #include <complib/cl_types.h> > > > > > #include <complib/cl_debug.h> > > > > > > > > > > > > > > > _______________________________________________ openib-general mailing list [email protected] http://openib.org/mailman/listinfo/openib-general To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
