[brlcad-commits] SF.net SVN: brlcad:[43013] brlcad/trunk/src/librt/comb/db_comb.c
Revision: 43013 http://brlcad.svn.sourceforge.net/brlcad/?rev=43013view=rev Author: brlcad Date: 2011-02-04 13:54:41 + (Fri, 04 Feb 2011) Log Message: --- missing header Modified Paths: -- brlcad/trunk/src/librt/comb/db_comb.c Modified: brlcad/trunk/src/librt/comb/db_comb.c === --- brlcad/trunk/src/librt/comb/db_comb.c 2011-02-04 07:16:32 UTC (rev 43012) +++ brlcad/trunk/src/librt/comb/db_comb.c 2011-02-04 13:54:41 UTC (rev 43013) @@ -48,7 +48,9 @@ #include mater.h #include raytrace.h +#include ../librt_private.h + #define STAT_ROT 1 #define STAT_XLATE 2 #define STAT_PERSP 4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The modern datacenter depends on network connectivity to access resources and provide services. The best practices for maximizing a physical server's connectivity to a physical network are well understood - see how these rules translate into the virtual world? http://p.sf.net/sfu/oracle-sfdevnlfb ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43014] brlcad/branches/cmake
Revision: 43014
http://brlcad.svn.sourceforge.net/brlcad/?rev=43014view=rev
Author: starseeker
Date: 2011-02-04 14:08:43 + (Fri, 04 Feb 2011)
Log Message:
---
Make a stab at C99 for the places we are known to need it on 10.6, and add a
define we apparently need for libfb + C99 on gentoo...
Modified Paths:
--
brlcad/branches/cmake/misc/CMake/CompilerFlags.cmake
brlcad/branches/cmake/src/libdm/CMakeLists.txt
brlcad/branches/cmake/src/libfb/CMakeLists.txt
brlcad/branches/cmake/src/mged/CMakeLists.txt
Modified: brlcad/branches/cmake/misc/CMake/CompilerFlags.cmake
===
--- brlcad/branches/cmake/misc/CMake/CompilerFlags.cmake2011-02-04
13:54:41 UTC (rev 43013)
+++ brlcad/branches/cmake/misc/CMake/CompilerFlags.cmake2011-02-04
14:08:43 UTC (rev 43014)
@@ -94,6 +94,19 @@
# CHECK_C_FLAG(msse)
# CHECK_C_FLAG(msse2)
+# Check for c99 support
+CHECK_C_FLAG(std=c99 C99_FLAG)
+MARK_AS_ADVANCED(C99_FLAG)
+
+# On some platforms (at least Gentoo linux, so far)
+# we'll need _XOPEN_SOURCE with std=c99. Eventually,
+# we'll probably want to wrap this up with some
+# feature based testing - i.e. use it if we need it.
+IF(C99_FLAG)
+ CHECK_C_FLAG(D_XOPEN_SOURCE=600 XOPEN_DEFINE)
+ MARK_AS_ADVANCED(XOPEN_DEFINE)
+ENDIF(C99_FLAG)
+
# 64bit compilation flags
IF(BRLCAD-ENABLE_64BIT)
IF(NOT 64BIT_FLAG AND NOT N64BIT_FLAG)
Modified: brlcad/branches/cmake/src/libdm/CMakeLists.txt
===
--- brlcad/branches/cmake/src/libdm/CMakeLists.txt 2011-02-04 13:54:41 UTC
(rev 43013)
+++ brlcad/branches/cmake/src/libdm/CMakeLists.txt 2011-02-04 14:08:43 UTC
(rev 43014)
@@ -61,6 +61,7 @@
add_definitions(
${DM_DEFINES}
+ ${C99_FLAG}
)
FOREACH(xlib ${X11_LIBRARIES})
Modified: brlcad/branches/cmake/src/libfb/CMakeLists.txt
===
--- brlcad/branches/cmake/src/libfb/CMakeLists.txt 2011-02-04 13:54:41 UTC
(rev 43013)
+++ brlcad/branches/cmake/src/libfb/CMakeLists.txt 2011-02-04 14:08:43 UTC
(rev 43014)
@@ -56,6 +56,8 @@
-DIF_AB
${FBX11DEFS}
${FBOGLDEFS}
+ ${C99_FLAG}
+ ${XOPEN_DEFINE}
)
BRLCAD_ADDLIB(libfb ${LIBFB_SOURCES} libbu libpkg ${LINKLIBS} STRICT)
Modified: brlcad/branches/cmake/src/mged/CMakeLists.txt
===
--- brlcad/branches/cmake/src/mged/CMakeLists.txt 2011-02-04 13:54:41 UTC
(rev 43013)
+++ brlcad/branches/cmake/src/mged/CMakeLists.txt 2011-02-04 14:08:43 UTC
(rev 43014)
@@ -49,6 +49,7 @@
add_definitions(
${MGED_DEFINES}
+ ${C99_FLAG}
)
SET(MGED_SOURCES
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43015] brlcad/branches/cmake/src/other/togl/CMake/ FindTCL.cmake
Revision: 43015
http://brlcad.svn.sourceforge.net/brlcad/?rev=43015view=rev
Author: starseeker
Date: 2011-02-04 14:17:39 + (Fri, 04 Feb 2011)
Log Message:
---
Update togl copy of FindTCL.cmake
Modified Paths:
--
brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake
Modified: brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake2011-02-04
14:08:43 UTC (rev 43014)
+++ brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake2011-02-04
14:17:39 UTC (rev 43015)
@@ -925,6 +925,8 @@
ENDFOREACH(tk_config_file
${TKCONFIG_LIST})
IF(NOT TKVALID)
SET(TCLVALID 0)
+ RESET_TCL_VARS()
+ RESET_TK_VARS()
ENDIF(NOT TKVALID)
ENDIF(TCL_REQUIRE_TK)
ENDIF(TCLVALID)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43016] brlcad/trunk/src/libfb/if_disk.c
Revision: 43016 http://brlcad.svn.sourceforge.net/brlcad/?rev=43016view=rev Author: erikgreenwald Date: 2011-02-04 14:43:03 + (Fri, 04 Feb 2011) Log Message: --- remove includes for unused headers and headers included via bio.h and fb.h Modified Paths: -- brlcad/trunk/src/libfb/if_disk.c Modified: brlcad/trunk/src/libfb/if_disk.c === --- brlcad/trunk/src/libfb/if_disk.c2011-02-04 14:17:39 UTC (rev 43015) +++ brlcad/trunk/src/libfb/if_disk.c2011-02-04 14:43:03 UTC (rev 43016) @@ -26,12 +26,6 @@ #include common.h -#include stdlib.h -#include string.h -#include sys/types.h -#ifdef HAVE_SYS_FILE_H -# include sys/file.h -#endif #include bio.h #include fb.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The modern datacenter depends on network connectivity to access resources and provide services. The best practices for maximizing a physical server's connectivity to a physical network are well understood - see how these rules translate into the virtual world? http://p.sf.net/sfu/oracle-sfdevnlfb ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43017] brlcad/trunk/src/libfb/if_ogl.c
Revision: 43017 http://brlcad.svn.sourceforge.net/brlcad/?rev=43017view=rev Author: erikgreenwald Date: 2011-02-04 15:19:02 + (Fri, 04 Feb 2011) Log Message: --- include unistd.h for getpagesize() Modified Paths: -- brlcad/trunk/src/libfb/if_ogl.c Modified: brlcad/trunk/src/libfb/if_ogl.c === --- brlcad/trunk/src/libfb/if_ogl.c 2011-02-04 14:43:03 UTC (rev 43016) +++ brlcad/trunk/src/libfb/if_ogl.c 2011-02-04 15:19:02 UTC (rev 43017) @@ -38,6 +38,11 @@ #ifdef IF_OGL +#define __BSD_VISIBLE 1/* needed to make getpagesize in unistd.h visible with C99/XOPEN strictness */ +#ifdef HAVE_UNISTD_H +# include unistd.h /* for getpagesize */ +#endif + #ifdef HAVE_SYS_TYPES_H # include sys/types.h #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The modern datacenter depends on network connectivity to access resources and provide services. The best practices for maximizing a physical server's connectivity to a physical network are well understood - see how these rules translate into the virtual world? http://p.sf.net/sfu/oracle-sfdevnlfb ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43018] brlcad/branches/cmake/src/libtclcad/CMakeLists. txt
Revision: 43018
http://brlcad.svn.sourceforge.net/brlcad/?rev=43018view=rev
Author: erikgreenwald
Date: 2011-02-04 15:30:14 + (Fri, 04 Feb 2011)
Log Message:
---
need C99 and XOPEN here
Modified Paths:
--
brlcad/branches/cmake/src/libtclcad/CMakeLists.txt
Modified: brlcad/branches/cmake/src/libtclcad/CMakeLists.txt
===
--- brlcad/branches/cmake/src/libtclcad/CMakeLists.txt 2011-02-04 15:19:02 UTC
(rev 43017)
+++ brlcad/branches/cmake/src/libtclcad/CMakeLists.txt 2011-02-04 15:30:14 UTC
(rev 43018)
@@ -26,6 +26,8 @@
add_definitions(
${TCLCAD_DEFINES}
+ ${C99_FLAG}
+ ${XOPEN_DEFINE}
)
FOREACH(xlib ${X11_LIBRARIES})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43020] brlcad/trunk/src/libfb/if_ogl.c
Revision: 43020 http://brlcad.svn.sourceforge.net/brlcad/?rev=43020view=rev Author: erikgreenwald Date: 2011-02-04 15:56:57 + (Fri, 04 Feb 2011) Log Message: --- move unistd to after the GL header to avoid issues with _DARWIN_C_SOURCE on osX.6 Modified Paths: -- brlcad/trunk/src/libfb/if_ogl.c Modified: brlcad/trunk/src/libfb/if_ogl.c === --- brlcad/trunk/src/libfb/if_ogl.c 2011-02-04 15:36:51 UTC (rev 43019) +++ brlcad/trunk/src/libfb/if_ogl.c 2011-02-04 15:56:57 UTC (rev 43020) @@ -38,11 +38,6 @@ #ifdef IF_OGL -#define __BSD_VISIBLE 1/* needed to make getpagesize in unistd.h visible with C99/XOPEN strictness */ -#ifdef HAVE_UNISTD_H -# include unistd.h /* for getpagesize */ -#endif - #ifdef HAVE_SYS_TYPES_H # include sys/types.h #endif @@ -78,6 +73,11 @@ # include GL/gl.h #endif +#define __BSD_VISIBLE 1/* needed to make getpagesize in unistd.h visible with C99/XOPEN strictness */ +#ifdef HAVE_UNISTD_H +# include unistd.h /* for getpagesize */ +#endif + #ifdef HAVE_SYS_WAIT_H # include sys/wait.h #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The modern datacenter depends on network connectivity to access resources and provide services. The best practices for maximizing a physical server's connectivity to a physical network are well understood - see how these rules translate into the virtual world? http://p.sf.net/sfu/oracle-sfdevnlfb ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43021] brlcad/trunk
Revision: 43021
http://brlcad.svn.sourceforge.net/brlcad/?rev=43021view=rev
Author: jordisayol
Date: 2011-02-04 16:28:16 + (Fri, 04 Feb 2011)
Log Message:
---
update desktop on install/remove scripts. changes deb/rpm description
Modified Paths:
--
brlcad/trunk/misc/debian/brlcad.postinst
brlcad/trunk/misc/debian/brlcad.postrm
brlcad/trunk/misc/debian/control
brlcad/trunk/sh/make_deb.sh
brlcad/trunk/sh/make_rpm.sh
Modified: brlcad/trunk/misc/debian/brlcad.postinst
===
(Binary files differ)
Modified: brlcad/trunk/misc/debian/brlcad.postrm
===
(Binary files differ)
Modified: brlcad/trunk/misc/debian/control
===
--- brlcad/trunk/misc/debian/control2011-02-04 15:56:57 UTC (rev 43020)
+++ brlcad/trunk/misc/debian/control2011-02-04 16:28:16 UTC (rev 43021)
@@ -11,15 +11,13 @@
Package: brlcad
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Constructive Solid Geometry (CSG) solid modeling system, binary
files
- BRL-CAD is a powerful cross-platform open source combinatorial
- Constructive Solid Geometry (CSG) solid modeling system that includes
- an interactive 3D solid geometry editor, a network-distributed
- symmetric multiprocessing high-performance ray-tracer,
+Description: BRL-CAD open source solid modeling
+ BRL-CAD is a powerful cross-platform Open Source combinatorial
+ Constructive Solid Geometry (CSG) solid modeling system that
+ includes interactive 3D solid geometry editing, high-performance
+ ray-tracing support for rendering and geometric analysis,
network-distributed framebuffer support, image and signal-processing
- tools, ray-tracing support for rendering and geometric analysis,
- path-tracing and photon mapping support for realistic image synthesis,
- animation capabilities, ray-tracing and numerical processing
- libraries, a system performance analysis benchmark suite, an embedded
- scripting interface, and a robust high-performance geometric
- representation and analysis library.
+ tools, path-tracing and photon mapping support for realistic image
+ synthesis, a system performance analysis benchmark suite, an embedded
+ scripting interface, and libraries for robust high-performance
+ geometric representation and analysis.
Modified: brlcad/trunk/sh/make_deb.sh
===
--- brlcad/trunk/sh/make_deb.sh 2011-02-04 15:56:57 UTC (rev 43020)
+++ brlcad/trunk/sh/make_deb.sh 2011-02-04 16:28:16 UTC (rev 43021)
@@ -80,9 +80,12 @@
ferror Refusing to build on a non-debian system.
fi
-# #
+# set variables
BVERSION=`cat include/conf/MAJOR`.`cat include/conf/MINOR`.`cat
include/conf/PATCH`
BVERSION=`echo $BVERSION | sed 's/[^0-9.]//g'`
+CDATE=`date -R`
+CFILE=debian/changelog
+RELEASE=0
# check needed packages
E=0
@@ -146,10 +149,8 @@
debian/brlcad-doc-animation.desktop
# update debian/chagelog if needed
-CDATE=`date -R`
-CFILE=debian/changelog
-if test -s $CFILE test `sed -n '1p' $CFILE | grep brlcad ($BVERSION- | wc
-l` -eq 0 ; then
-L1=brlcad ($BVERSION-0) unstable; urgency=low\n\n
+if test -s $CFILE test `sed -n '1p' $CFILE | grep brlcad
($BVERSION-$RELEASE | wc -l` -eq 0 ; then
+L1=brlcad ($BVERSION-$RELEASE) unstable; urgency=low\n\n
L2= VERSION ENTRY AUTOMATICALLY ADDED BY \sh\/make_deb.sh\ SCRIPT
\n\n
L3= -- Jordi Sayol g.sa...@yahoo.es $CDATE\n\n/
sed -i 1s/^/$L1$L2$L3 $CFILE
Modified: brlcad/trunk/sh/make_rpm.sh
===
--- brlcad/trunk/sh/make_rpm.sh 2011-02-04 15:56:57 UTC (rev 43020)
+++ brlcad/trunk/sh/make_rpm.sh 2011-02-04 16:28:16 UTC (rev 43021)
@@ -69,6 +69,7 @@
BVERSION=`cat include/conf/MAJOR`.`cat include/conf/MINOR`.`cat
include/conf/PATCH`
BVERSION=`echo $BVERSION | sed 's/[^0-9.]//g'`
TMPDIR=misc/$DNAME-tmp
+RELEASE=0
if test `uname -m | grep -iwE i[3-6]86 | wc -l` -eq 1 ;then
ARCH=`uname -m`
@@ -176,7 +177,7 @@
#Create brlcad.spec file
echo -e 'Name: brlcad
Version: '$BVERSION'
-Release: 0
+Release: '$RELEASE'
Summary: BRL-CAD open source solid modeling
Group: Productivity/Graphics/CAD
@@ -185,7 +186,7 @@
Packager: Jordi Sayol g.sa...@yahoo.es
ExclusiveArch: '$ARCH'
-Provides: brlcad = '$BVERSION'-0, brlcad('$FARCH') = '$BVERSION'-0
+Provides: brlcad = '$BVERSION'-'$RELEASE', brlcad('$FARCH') =
'$BVERSION'-'$RELEASE'
%description
BRL-CAD is a powerful cross-platform Open Source combinatorial
@@ -201,17 +202,35 @@
Homepage: http://brlcad.org
%post
+set -e
+
+F=/usr/share/applications/defaults.list
+
+if [ ! -f $F ]; then
+ echo [Default Applications] $F
+fi
+
+sed -i /application\/x-brlcad-extension=/d $F
+
+echo application/x-brlcad-extension=brlcad-archer.desktop $F
+
[brlcad-commits] SF.net SVN: brlcad:[43023] brlcad/trunk/src
Revision: 43023
http://brlcad.svn.sourceforge.net/brlcad/?rev=43023view=rev
Author: brlcad
Date: 2011-02-04 19:23:51 + (Fri, 04 Feb 2011)
Log Message:
---
let the user know that the database was intentionally converted to read-only.
not a permissions issue. mixed encoding would be very bad.
Modified Paths:
--
brlcad/trunk/src/librt/db_open.c
brlcad/trunk/src/mged/mged.c
Modified: brlcad/trunk/src/librt/db_open.c
===
--- brlcad/trunk/src/librt/db_open.c2011-02-04 18:36:33 UTC (rev 43022)
+++ brlcad/trunk/src/librt/db_open.c2011-02-04 19:23:51 UTC (rev 43023)
@@ -215,7 +215,8 @@
if (dbip-dbi_version 0)
dbip-dbi_version *= -1;
dbip-dbi_read_only = 1;
- bu_log(WARNING: Binary-incompatible v4 geometry database detected.
Endianness flipped.\n);
+ bu_log(WARNING: Binary-incompatible v4 geometry database
detected.\n);
+ bu_log( Endianness flipped. Converting to READ ONLY.\n);
}
}
Modified: brlcad/trunk/src/mged/mged.c
===
--- brlcad/trunk/src/mged/mged.c2011-02-04 18:36:33 UTC (rev 43022)
+++ brlcad/trunk/src/mged/mged.c2011-02-04 19:23:51 UTC (rev 43023)
@@ -2784,6 +2784,7 @@
bu_log(Database [%s] was already (perhaps automatically)
flipped, -f is redundant.\n, dbip-dbi_filename);
} else {
bu_log(Treating [%s] as a binary-incompatible v4 geometry
database.\n, dbip-dbi_filename);
+ bu_log(Endianness flipped. Converting to READ ONLY.\n);
/* flip the version number to indicate a flipped database. */
dbip-dbi_version *= -1;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43024] brlcad/trunk/include/ged.h
Revision: 43024
http://brlcad.svn.sourceforge.net/brlcad/?rev=43024view=rev
Author: brlcad
Date: 2011-02-04 19:45:01 + (Fri, 04 Feb 2011)
Log Message:
---
add some rather old high-level whiteboard data structure notes on a simple
organization for libged.
Modified Paths:
--
brlcad/trunk/include/ged.h
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2011-02-04 19:23:51 UTC (rev 43023)
+++ brlcad/trunk/include/ged.h 2011-02-04 19:45:01 UTC (rev 43024)
@@ -2405,6 +2405,36 @@
GED_EXPORT BU_EXTERN(int ged_zoom, (struct ged *gedp, int argc, const char
*argv[]));
+
+/***
+ * Conceptual Documentation for LIBGED *
+ ***
+ *
+ * Below are developer notes for a data structure layout that this
+ * library is being migrated towards. This is not necessarily the
+ * current status of the library, but rather a high-level concept for
+ * how the data might be organized down the road for the core data
+ * structures available for application and extension management.
+ *
+ * struct ged {
+ * dbip
+ * views * -.
+ * result() |
+ * } |
+ * |
+ * struct view { -'
+ * geometry * --.
+ * update() |
+ * } |
+ * |
+ * struct geometry { -'
+ * display lists
+ * directory *
+ * update()
+ * }
+ *
+ */
+
__END_DECLS
#endif /* __GED_H__ */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43025] rt^3/trunk/tests/GS/GeometryServiceTest.cxx
Revision: 43025
http://brlcad.svn.sourceforge.net/brlcad/?rev=43025view=rev
Author: davidloman
Date: 2011-02-04 19:49:07 + (Fri, 04 Feb 2011)
Log Message:
---
More remnants of work that are attempts in getting the test harness working
with the gs libs.
Modified Paths:
--
rt^3/trunk/tests/GS/GeometryServiceTest.cxx
Modified: rt^3/trunk/tests/GS/GeometryServiceTest.cxx
===
--- rt^3/trunk/tests/GS/GeometryServiceTest.cxx 2011-02-04 19:45:01 UTC (rev
43024)
+++ rt^3/trunk/tests/GS/GeometryServiceTest.cxx 2011-02-04 19:49:07 UTC (rev
43025)
@@ -54,31 +54,53 @@
public:
GeometryServer(const QHostAddress addy = QHostAddress::LocalHost, const
quint16 port = DEFAULT_PORT)
{
- //this-gs = new GeometryService(GSTester);
+ if (port 0)
+ start(addy, port);
+}
- if (port 0)
- start(addy, port);
-}
~GeometryServer()
{
- delete this-gs;
+ if (this-gs != NULL)
+ delete this-gs;
}
+
bool stillRunning() const
{
- //For now, make the test simple
- //return this-gs-isListening();
- return false;
+GSThread::sleep(1);
+std::cout \tGS: this-gs std::endl;
+
+ if (this-gs == NULL)
+ return false;
+
+ bool isRun = this-gs-isRunning();
+
+ GSThread::sleep(1);
+std::cout \tisRun isRun std::endl;
+
+
+ return isRun;
}
+
void start(const QHostAddress addy = QHostAddress::LocalHost, const
quint16 port = DEFAULT_PORT)
{
- this-_port = port;
- this-_addy = addy;
+ /* FIXME Are these two internals really needed? */
+ this-_port = port;
+ this-_addy = addy;
- //this-gs-startListening(this-_addy, this-_port);
+ this-gs = new GeometryService(Athena, port, addy);
+
+ this-gs-start();
}
+
void stop() const
{
- //this-gs-stopListening();
+ if (this-gs == NULL) {
+ return;
+ }
+
+ this-gs-shutdown();
+ GSThread::msleep(100);
+ delete this-gs;
}
};
@@ -91,6 +113,8 @@
{
private:
QUuid testClientID;
+GSClient* gsClient;
+Portal* portal;
bool exists(std::string object) const
{
@@ -103,18 +127,44 @@
public:
GeometryClient()
{
+ this-testClientID = QUuid::createUuid();
+ this-gsClient = new GSClient(this-testClientID.toString());
+ this-portal == NULL;
+ std::cerr Portal: this-portal std::endl;
}
~GeometryClient()
{
+ if (this-gsClient != NULL)
+ delete gsClient;
}
-void connect(const QHostAddress address = QHostAddress::LocalHost, int
port = DEFAULT_PORT) const
+void connect(const QHostAddress address = QHostAddress::LocalHost, int
port = DEFAULT_PORT)
{
- if (port 0) {
- std::cerr Unexpected test harness state std::endl;
- exit(1);
- }
+ if (port 0) {
+ std::cerr Unexpected test harness state: port0
std::endl;
+ exit(1);
+ }
+ if (this-gsClient == NULL) {
+ std::cerr Unexpected test harness state: Null
GSClient std::endl;
+ exit(1);
+ }
+
+ PortalManager* clientPortMan = this-gsClient-getPortMan();
+
+ if (clientPortMan == NULL) {
+ std::cerr Unexpected test harness state: Null
PortalManager std::endl;
+ exit(1);
+ }
+
+ Portal* p = clientPortMan-connectToHost(localhost, 12345);
+
+ if (p == NULL) {
+ std::cerr Unexpected test harness state: Failure on
ConnectToHost. Portal: this-portal std::endl;
+ return;
+ }
+
+ this-portal = p;
}
void disconnect() const
@@ -123,7 +173,7 @@
bool connected() const
{
- return false;
+ return (this-portal != NULL);
}
//TODO implement 'getDirectory'
@@ -441,6 +491,9 @@
int main(int ac, char *av[])
{
+ Logger::getInstance();
+ JobManager::getInstance();
+
//disable the logger for now.
Logger::getInstance()-disableLogToConsole();
@@ -473,13 +526,43 @@
REQUIREMENT(Server restarts);
gs-stop();
+GSThread::sleep(1);
+std::cout \t1\n;
+
GAS(!gs-stillRunning(), Server shutting down);
+GSThread::sleep(1);
+std::cout \t2\n;
+
gc-connect();
+GSThread::sleep(1);
+std::cout \t3\n;
+
GAS(!gc-connected(), Client prevented from connecting);
+GSThread::sleep(1);
+std::cout \t4\n;
+
gs-start();
+GSThread::sleep(1);
+std::cout \t5\n;
+
RESULT();
+/* cleanup */
+GSThread::msleep(1000 * 3);
[brlcad-commits] SF.net SVN: brlcad:[43026] brlcad/trunk/src/tclscripts/archer/Archer.tcl
Revision: 43026
http://brlcad.svn.sourceforge.net/brlcad/?rev=43026view=rev
Author: bob1961
Date: 2011-02-04 20:30:09 + (Fri, 04 Feb 2011)
Log Message:
---
Added an fbclear command.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-04 19:49:07 UTC
(rev 43025)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-04 20:30:09 UTC
(rev 43026)
@@ -154,6 +154,7 @@
# General
method askToRevert {}
+ method fbclear {}
method raytracePlus {}
# ArcherCore Override Section
@@ -952,6 +953,11 @@
}
+::itcl::body Archer::fbclear {} {
+$itk_component(rtcntrl) clear
+}
+
+
::itcl::body Archer::raytracePlus {} {
$itk_component(primaryToolbar) itemconfigure raytrace \
-image $mImage_rtAbort \
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43027] brlcad/trunk/src/bwish/main.c
Revision: 43027
http://brlcad.svn.sourceforge.net/brlcad/?rev=43027view=rev
Author: erikgreenwald
Date: 2011-02-04 21:40:32 + (Fri, 04 Feb 2011)
Log Message:
---
verify the ::itcl namespace exists before trying to delete it.
Modified Paths:
--
brlcad/trunk/src/bwish/main.c
Modified: brlcad/trunk/src/bwish/main.c
===
--- brlcad/trunk/src/bwish/main.c 2011-02-04 20:30:09 UTC (rev 43026)
+++ brlcad/trunk/src/bwish/main.c 2011-02-04 21:40:32 UTC (rev 43027)
@@ -118,12 +118,16 @@
Tcl_ResetResult(interp);
if (init_itcl Tcl_Eval(interp, package require Itcl) != TCL_OK) {
if (!try_auto_path) {
+ Tcl_Namespace *nsp;
+
try_auto_path=1;
/* Itcl_Init() leaves initialization in a bad state
* and can cause retry failures. cleanup manually.
*/
Tcl_DeleteCommand(interp, ::itcl::class);
- Tcl_DeleteNamespace(Tcl_FindNamespace(interp, ::itcl, NULL,
0));
+ nsp = Tcl_FindNamespace(interp, ::itcl, NULL, 0);
+ if(nsp != NULL)
+ Tcl_DeleteNamespace(nsp);
continue;
}
bu_log(Itcl_Init ERROR:\n%s\n, Tcl_GetStringResult(interp));
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43028] brlcad/trunk/src/libfb/if_ogl.c
Revision: 43028 http://brlcad.svn.sourceforge.net/brlcad/?rev=43028view=rev Author: erikgreenwald Date: 2011-02-04 22:06:11 + (Fri, 04 Feb 2011) Log Message: --- __BSD_VISIBLE has to be before sys/types.h Modified Paths: -- brlcad/trunk/src/libfb/if_ogl.c Modified: brlcad/trunk/src/libfb/if_ogl.c === --- brlcad/trunk/src/libfb/if_ogl.c 2011-02-04 21:40:32 UTC (rev 43027) +++ brlcad/trunk/src/libfb/if_ogl.c 2011-02-04 22:06:11 UTC (rev 43028) @@ -38,6 +38,11 @@ #ifdef IF_OGL +/* needed to make getpagesize in unistd.h visible with C99/XOPEN + * strictness. Needs to be before sys/types.h, but unistd has to be + * after the GL stuff. */ +#define __BSD_VISIBLE 1 + #ifdef HAVE_SYS_TYPES_H # include sys/types.h #endif @@ -73,7 +78,6 @@ # include GL/gl.h #endif -#define __BSD_VISIBLE 1/* needed to make getpagesize in unistd.h visible with C99/XOPEN strictness */ #ifdef HAVE_UNISTD_H # include unistd.h /* for getpagesize */ #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The modern datacenter depends on network connectivity to access resources and provide services. The best practices for maximizing a physical server's connectivity to a physical network are well understood - see how these rules translate into the virtual world? http://p.sf.net/sfu/oracle-sfdevnlfb ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43029] brlcad/trunk/src/mged/setup.c
Revision: 43029
http://brlcad.svn.sourceforge.net/brlcad/?rev=43029view=rev
Author: erikgreenwald
Date: 2011-02-04 22:19:40 + (Fri, 04 Feb 2011)
Log Message:
---
verify the ::itcl namespace exists before trying to delete it.
Modified Paths:
--
brlcad/trunk/src/mged/setup.c
Modified: brlcad/trunk/src/mged/setup.c
===
--- brlcad/trunk/src/mged/setup.c 2011-02-04 22:06:11 UTC (rev 43028)
+++ brlcad/trunk/src/mged/setup.c 2011-02-04 22:19:40 UTC (rev 43029)
@@ -507,12 +507,16 @@
Tcl_ResetResult(*interpreter);
if (init_itcl Tcl_Eval(*interpreter, package require Itcl) !=
TCL_OK) {
if (!try_auto_path) {
+ Tcl_Namespace *nsp;
+
try_auto_path = 1;
/* Itcl_Init() leaves initialization in a bad state
* and can cause retry failures. cleanup manually.
*/
Tcl_DeleteCommand(*interpreter, ::itcl::class);
- Tcl_DeleteNamespace(Tcl_FindNamespace(*interpreter, ::itcl,
NULL, 0));
+ nsp = Tcl_FindNamespace(*interpreter, ::itcl, NULL, 0);
+ if(nsp)
+ Tcl_DeleteNamespace(nsp);
continue;
}
bu_log(Itcl_Init ERROR:\n%s\n, Tcl_GetStringResult(*interpreter));
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43030] brlcad/branches/cmake
Revision: 43030
http://brlcad.svn.sourceforge.net/brlcad/?rev=43030view=rev
Author: starseeker
Date: 2011-02-04 22:32:21 + (Fri, 04 Feb 2011)
Log Message:
---
MFC 43029
Modified Paths:
--
brlcad/branches/cmake/include/ged.h
brlcad/branches/cmake/misc/debian/brlcad.postinst
brlcad/branches/cmake/misc/debian/brlcad.postrm
brlcad/branches/cmake/misc/debian/control
brlcad/branches/cmake/sh/make_deb.sh
brlcad/branches/cmake/sh/make_rpm.sh
brlcad/branches/cmake/src/bwish/main.c
brlcad/branches/cmake/src/libfb/if_ogl.c
brlcad/branches/cmake/src/librt/db_open.c
brlcad/branches/cmake/src/mged/mged.c
brlcad/branches/cmake/src/mged/setup.c
brlcad/branches/cmake/src/tclscripts/archer/Archer.tcl
Property Changed:
brlcad/branches/cmake/
brlcad/branches/cmake/misc/debian/brlcad.postinst
brlcad/branches/cmake/misc/debian/brlcad.postrm
brlcad/branches/cmake/misc/debian/brlcad.sh
Property changes on: brlcad/branches/cmake
___
Added: svn:mergeinfo
+ /brlcad/trunk:43019-43029
Modified: brlcad/branches/cmake/include/ged.h
===
--- brlcad/branches/cmake/include/ged.h 2011-02-04 22:19:40 UTC (rev 43029)
+++ brlcad/branches/cmake/include/ged.h 2011-02-04 22:32:21 UTC (rev 43030)
@@ -2405,6 +2405,36 @@
GED_EXPORT BU_EXTERN(int ged_zoom, (struct ged *gedp, int argc, const char
*argv[]));
+
+/***
+ * Conceptual Documentation for LIBGED *
+ ***
+ *
+ * Below are developer notes for a data structure layout that this
+ * library is being migrated towards. This is not necessarily the
+ * current status of the library, but rather a high-level concept for
+ * how the data might be organized down the road for the core data
+ * structures available for application and extension management.
+ *
+ * struct ged {
+ * dbip
+ * views * -.
+ * result() |
+ * } |
+ * |
+ * struct view { -'
+ * geometry * --.
+ * update() |
+ * } |
+ * |
+ * struct geometry { -'
+ * display lists
+ * directory *
+ * update()
+ * }
+ *
+ */
+
__END_DECLS
#endif /* __GED_H__ */
Modified: brlcad/branches/cmake/misc/debian/brlcad.postinst
===
(Binary files differ)
Property changes on: brlcad/branches/cmake/misc/debian/brlcad.postinst
___
Modified: svn:mime-type
- application/x-shellscript
+ text/x-sh
Added: svn:eol-style
+ native
Modified: brlcad/branches/cmake/misc/debian/brlcad.postrm
===
(Binary files differ)
Property changes on: brlcad/branches/cmake/misc/debian/brlcad.postrm
___
Modified: svn:mime-type
- application/x-shellscript
+ text/x-sh
Added: svn:eol-style
+ native
Property changes on: brlcad/branches/cmake/misc/debian/brlcad.sh
___
Modified: svn:mime-type
- application/x-shellscript
+ text/x-sh
Added: svn:eol-style
+ native
Modified: brlcad/branches/cmake/misc/debian/control
===
--- brlcad/branches/cmake/misc/debian/control 2011-02-04 22:19:40 UTC (rev
43029)
+++ brlcad/branches/cmake/misc/debian/control 2011-02-04 22:32:21 UTC (rev
43030)
@@ -11,15 +11,13 @@
Package: brlcad
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Constructive Solid Geometry (CSG) solid modeling system, binary
files
- BRL-CAD is a powerful cross-platform open source combinatorial
- Constructive Solid Geometry (CSG) solid modeling system that includes
- an interactive 3D solid geometry editor, a network-distributed
- symmetric multiprocessing high-performance ray-tracer,
+Description: BRL-CAD open source solid modeling
+ BRL-CAD is a powerful cross-platform Open Source combinatorial
+ Constructive Solid Geometry (CSG) solid modeling system that
+ includes interactive 3D solid geometry editing, high-performance
+ ray-tracing support for rendering and geometric analysis,
network-distributed framebuffer support, image and signal-processing
- tools, ray-tracing support for rendering and geometric analysis,
- path-tracing and photon mapping support for realistic image synthesis,
- animation capabilities, ray-tracing and numerical processing
- libraries, a system performance analysis benchmark suite, an embedded
- scripting interface, and a robust high-performance geometric
- representation and analysis library.
+ tools, path-tracing and photon mapping support for realistic image
+ synthesis, a
[brlcad-commits] SF.net SVN: brlcad:[43031] brlcad/branches/cmake/misc/CMake/test_srcs/ builddelta_end.c.in
Revision: 43031
http://brlcad.svn.sourceforge.net/brlcad/?rev=43031view=rev
Author: starseeker
Date: 2011-02-05 01:04:00 + (Sat, 05 Feb 2011)
Log Message:
---
Eh, why not. Make the CMake build summary match the autotools printout.
Modified Paths:
--
brlcad/branches/cmake/misc/CMake/test_srcs/builddelta_end.c.in
Modified: brlcad/branches/cmake/misc/CMake/test_srcs/builddelta_end.c.in
===
--- brlcad/branches/cmake/misc/CMake/test_srcs/builddelta_end.c.in
2011-02-04 22:32:21 UTC (rev 43030)
+++ brlcad/branches/cmake/misc/CMake/test_srcs/builddelta_end.c.in
2011-02-05 01:04:00 UTC (rev 43031)
@@ -1,25 +1,7 @@
#include time.h
#include stdio.h
-int main(void) {
- FILE *infp = NULL;
- time_t t, ts, te;
- struct tm *currenttime;
- struct tm starttime;
- int tdiff, d_mins, d_hrs, d_days;
- t = time(NULL);
- currenttime = localtime(t);
- infp = fopen(${BUILD_DELTA_START}, r);
-/* starttime.tm_zone = currenttime-tm_zone;
- starttime.tm_gmtoff = currenttime-tm_gmtoff;*/
- fscanf(infp, %d/%d/%d/%d/%d/%d/%d/%d/%d, (starttime.tm_sec),
(starttime.tm_min), (starttime.tm_hour), (starttime.tm_mday),
(starttime.tm_mon), (starttime.tm_year), (starttime.tm_wday),
(starttime.tm_yday), (starttime.tm_isdst));
- fclose(infp);
-
- ts = mktime(starttime);
- te = mktime(currenttime);
-
- printf(\nDone.\n\nElapsed Compilation Time: );
-
- tdiff = (int)difftime(te, ts);
+void printtime(int tdiff) {
+ int d_mins, d_hrs, d_days;
d_days = 0;
d_hrs = 0;
d_mins = 0;
@@ -67,8 +49,48 @@
if (tdiff == 0 d_mins == 0 d_hrs == 0 d_days == 0) {
printf(0 seconds );
}
+}
- printf(\n\n);
+int main(void) {
+ FILE *infp = NULL;
+ time_t t, ts, te;
+ struct tm *currenttime;
+ struct tm starttime;
+ int tdiff;
+ t = time(NULL);
+ currenttime = localtime(t);
+ infp = fopen(${BUILD_DELTA_START}, r);
+/* starttime.tm_zone = currenttime-tm_zone;
+ starttime.tm_gmtoff = currenttime-tm_gmtoff;*/
+ fscanf(infp, %d/%d/%d/%d/%d/%d/%d/%d/%d, (starttime.tm_sec),
(starttime.tm_min), (starttime.tm_hour), (starttime.tm_mday),
(starttime.tm_mon), (starttime.tm_year), (starttime.tm_wday),
(starttime.tm_yday), (starttime.tm_isdst));
+ fclose(infp);
+
+ ts = mktime(starttime);
+ te = mktime(currenttime);
+ printf(Done.\n\n);
+
+ printf(BRL-CAD Release ${BRLCAD_VERSION}, Build ${CONFIG_DATE}\n\n);
+
+ printf(Elapsed compilation time: );
+
+ tdiff = (int)difftime(te, ts);
+
+ printtime(tdiff);
+
+ printf(\nElapsed time since configuration: );
+
+ infp = fopen(${DELTA_START}, r);
+ fscanf(infp, %d/%d/%d/%d/%d/%d/%d/%d/%d, (starttime.tm_sec),
(starttime.tm_min), (starttime.tm_hour), (starttime.tm_mday),
(starttime.tm_mon), (starttime.tm_year), (starttime.tm_wday),
(starttime.tm_yday), (starttime.tm_isdst));
+ fclose(infp);
+ ts = mktime(starttime);
+ tdiff = (int)difftime(te, ts);
+ printtime(tdiff);
+ printf(\n---\n);
+
+ printf(Run 'make install' to begin installation into
${CMAKE_INSTALL_PREFIX}\n);
+ printf(Run 'make benchmark' to run the BRL-CAD Benchmark Suite\n);
+ printf(\n);
+
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43032] brlcad/branches/cmake/src/other/libz/
Revision: 43032 http://brlcad.svn.sourceforge.net/brlcad/?rev=43032view=rev Author: starseeker Date: 2011-02-05 03:33:05 + (Sat, 05 Feb 2011) Log Message: --- Goal is to not use svn:ignore at all, but until CMake is the only build system we have to both keep zconf.h around for autotools and ignore its removal for CMake Property Changed: brlcad/branches/cmake/src/other/libz/ Property changes on: brlcad/branches/cmake/src/other/libz ___ Modified: svn:ignore - + zconf.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The modern datacenter depends on network connectivity to access resources and provide services. The best practices for maximizing a physical server's connectivity to a physical network are well understood - see how these rules translate into the virtual world? http://p.sf.net/sfu/oracle-sfdevnlfb ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43033] brlcad/branches/cmake/src/other/libz/
Revision: 43033 http://brlcad.svn.sourceforge.net/brlcad/?rev=43033view=rev Author: starseeker Date: 2011-02-05 03:34:18 + (Sat, 05 Feb 2011) Log Message: --- Nevermind, it still spots the removal. grr Property Changed: brlcad/branches/cmake/src/other/libz/ Property changes on: brlcad/branches/cmake/src/other/libz ___ Deleted: svn:ignore - zconf.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The modern datacenter depends on network connectivity to access resources and provide services. The best practices for maximizing a physical server's connectivity to a physical network are well understood - see how these rules translate into the virtual world? http://p.sf.net/sfu/oracle-sfdevnlfb ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43034] brlcad/branches/cmake
Revision: 43034
http://brlcad.svn.sourceforge.net/brlcad/?rev=43034view=rev
Author: starseeker
Date: 2011-02-05 03:54:20 + (Sat, 05 Feb 2011)
Log Message:
---
Very beginning ideas for a distcheck rule for CMake build. Using svn to
identify anything foreign in the source tree - this imposes the requirements of
not using svn:ignore for anything in the tree and out-of-source-dir builds for
a distcheck build, both of which should be reasonable and work (the CMake logic
does not need to generate any files in-source-dir
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
Added Paths:
---
brlcad/branches/cmake/misc/CMake/svncheck.cmake
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2011-02-05 03:34:18 UTC (rev
43033)
+++ brlcad/branches/cmake/CMakeLists.txt2011-02-05 03:54:20 UTC (rev
43034)
@@ -1536,6 +1536,17 @@
SET(CPACK_SOURCE_IGNORE_FILES .svn/)
INCLUDE(CPack)
+configure_file(${BRLCAD_CMAKE_DIR}/svncheck.cmake
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/svncheck.cmake COPYONLY)
+ADD_CUSTOM_TARGET(distcheck
+ COMMAND svn status ${CMAKE_SOURCE_DIR} svnstatus
+ COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/svncheck.cmake
+ COMMAND cpack --config
${CMAKE_CURRENT_BINARY_DIR}/CPackSourceConfig.cmake
+ COMMAND ${CMAKE_COMMAND} -E tar xvzf
${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
+ COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
+ COMMAND ${CMAKE_COMMAND} -E chdir
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build ${CMAKE_COMMAND}
../${CPACK_SOURCE_PACKAGE_FILE_NAME} -DBRLCAD-ENABLE_ALL_LOCAL_LIBS=ON
+ )
+
+
# Mark various miscellaneous things as advanced that we don't want in our
# default view
MARK_AS_ADVANCED(BRLCAD_PREFIX)
Added: brlcad/branches/cmake/misc/CMake/svncheck.cmake
===
--- brlcad/branches/cmake/misc/CMake/svncheck.cmake
(rev 0)
+++ brlcad/branches/cmake/misc/CMake/svncheck.cmake 2011-02-05 03:54:20 UTC
(rev 43034)
@@ -0,0 +1,13 @@
+FILE(READ svnstatus SVNSTATUS)
+STRING(REGEX REPLACE \r?\n ; STATUSLIST ${SVNSTATUS})
+FOREACH(line ${STATUSLIST})
+ IF(NOT ${line} MATCHES src/other/libz/zconf.h)
+ SET(SVNMESSAGE ${SVNMESSAGE}\n${line})
+ ENDIF(NOT ${line} MATCHES src/other/libz/zconf.h)
+ENDFOREACH(line ${STATUSLIST})
+
+IF(SVNMESSAGE)
+ MESSAGE(FATAL_ERROR \nSVN Check: Uncommitted files or changes in
source tree, distcheck failed:\n${SVNMESSAGE}\n)
+ELSE(SVNMESSAGE)
+ MESSAGE(SVN Check: Passed)
+ENDIF(SVNMESSAGE)
Property changes on: brlcad/branches/cmake/misc/CMake/svncheck.cmake
___
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43035] brlcad/branches/cmake/CMakeLists.txt
Revision: 43035
http://brlcad.svn.sourceforge.net/brlcad/?rev=43035view=rev
Author: starseeker
Date: 2011-02-05 04:19:52 + (Sat, 05 Feb 2011)
Log Message:
---
Hmm. Try fleshing out the steps for distcheck a bit more...
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2011-02-05 03:54:20 UTC (rev
43034)
+++ brlcad/branches/cmake/CMakeLists.txt2011-02-05 04:19:52 UTC (rev
43035)
@@ -1543,7 +1543,11 @@
COMMAND cpack --config
${CMAKE_CURRENT_BINARY_DIR}/CPackSourceConfig.cmake
COMMAND ${CMAKE_COMMAND} -E tar xvzf
${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
- COMMAND ${CMAKE_COMMAND} -E chdir
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build ${CMAKE_COMMAND}
../${CPACK_SOURCE_PACKAGE_FILE_NAME} -DBRLCAD-ENABLE_ALL_LOCAL_LIBS=ON
+ COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
+ COMMAND ${CMAKE_COMMAND} -E chdir
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build ${CMAKE_COMMAND}
../${CPACK_SOURCE_PACKAGE_FILE_NAME} -DBRLCAD-ENABLE_ALL_LOCAL_LIBS=ON
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
+ COMMAND ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build -- -j3
+ COMMAND ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target regress
+ COMMAND ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target install
)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
