Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[9324] pkg/trunk
|
From: <jfa...@us...> - 2009-01-13 07:24:20
|
Revision: 9324
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=9324&view=rev
Author: jfaustwg
Date: 2009-01-13 07:24:01 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
Merge from josh branch... compatibility with roscpp sessions merge and cmake 2.4
Modified Paths:
--------------
pkg/trunk/3rdparty/ANN/Makefile
pkg/trunk/3rdparty/FL-ANN/Makefile
pkg/trunk/3rdparty/bfl/Makefile
pkg/trunk/3rdparty/bullet/Makefile
pkg/trunk/3rdparty/convex_decomposition/Makefile
pkg/trunk/3rdparty/eigen/Makefile
pkg/trunk/3rdparty/eml/Makefile
pkg/trunk/3rdparty/estar/Makefile
pkg/trunk/3rdparty/fast_detector/CMakeLists.txt
pkg/trunk/3rdparty/freeimage/Makefile
pkg/trunk/3rdparty/glc/elfhacks/Makefile
pkg/trunk/3rdparty/glc/glc/Makefile
pkg/trunk/3rdparty/glc/packetstream/Makefile
pkg/trunk/3rdparty/gmapping/Makefile
pkg/trunk/3rdparty/ivcon/CMakeLists.txt
pkg/trunk/3rdparty/kdl/Makefile
pkg/trunk/3rdparty/libbk_maxflow/CMakeLists.txt
pkg/trunk/3rdparty/libdc1394v2/Makefile
pkg/trunk/3rdparty/libfz_ht_superpixels/CMakeLists.txt
pkg/trunk/3rdparty/libsunflower/Makefile
pkg/trunk/3rdparty/opencv_latest/Makefile
pkg/trunk/3rdparty/opende/Makefile
pkg/trunk/3rdparty/openrave/Makefile
pkg/trunk/3rdparty/player/Makefile
pkg/trunk/3rdparty/plplot/Makefile
pkg/trunk/3rdparty/sicktoolbox/Makefile
pkg/trunk/3rdparty/sicktoolbox/stdlib_include.patch
pkg/trunk/3rdparty/soqt/Makefile
pkg/trunk/3rdparty/spacenav/Makefile
pkg/trunk/3rdparty/stage/Makefile
pkg/trunk/3rdparty/toro/Makefile
pkg/trunk/3rdparty/trex/Makefile
pkg/trunk/3rdparty/velodyne-driver/Makefile
pkg/trunk/3rdparty/xenomai/manifest.xml
pkg/trunk/audio/audio_capture/CMakeLists.txt
pkg/trunk/calibration/kinematic_calibration/CMakeLists.txt
pkg/trunk/calibration/wheel_odometry_calibration/CMakeLists.txt
pkg/trunk/calibration/wheel_odometry_calibration/manifest.xml
pkg/trunk/calibration/wheel_odometry_calibration/src/odom_calib.h
pkg/trunk/controllers/control_toolbox/CMakeLists.txt
pkg/trunk/controllers/pr2_mechanism_controllers/CMakeLists.txt
pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml
pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/CMakeLists.txt
pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/manifest.xml
pkg/trunk/controllers/robot_mechanism_controllers/CMakeLists.txt
pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml
pkg/trunk/demos/2dnav_gazebo/CMakeLists.txt
pkg/trunk/deprecated/libTF/CMakeLists.txt
pkg/trunk/deprecated/plan_kinematic_path/CMakeLists.txt
pkg/trunk/drivers/cam/axis_cam/CMakeLists.txt
pkg/trunk/drivers/cam/bumblebee_bridge/CMakeLists.txt
pkg/trunk/drivers/cam/dc1394_cam/CMakeLists.txt
pkg/trunk/drivers/cam/dc1394_cam_server/CMakeLists.txt
pkg/trunk/drivers/cam/dcam/CMakeLists.txt
pkg/trunk/drivers/cam/videre_cam/CMakeLists.txt
pkg/trunk/drivers/imu/3dmgx2_driver/CMakeLists.txt
pkg/trunk/drivers/imu/imu_node/CMakeLists.txt
pkg/trunk/drivers/input/joy/CMakeLists.txt
pkg/trunk/drivers/input/joy_node/CMakeLists.txt
pkg/trunk/drivers/laser/hokuyo_driver/CMakeLists.txt
pkg/trunk/drivers/laser/hokuyo_node/CMakeLists.txt
pkg/trunk/drivers/laser/laser_scan_annotator/CMakeLists.txt
pkg/trunk/drivers/laser/laser_view/CMakeLists.txt
pkg/trunk/drivers/laser/sicktoolbox_wrapper/CMakeLists.txt
pkg/trunk/drivers/motor/ethercat_hardware/CMakeLists.txt
pkg/trunk/drivers/motor/ethercat_hardware/src/ethercat_hardware.cpp
pkg/trunk/drivers/network/wifi_ddwrt/CMakeLists.txt
pkg/trunk/drivers/phase_space/CMakeLists.txt
pkg/trunk/drivers/robot/erratic_player/CMakeLists.txt
pkg/trunk/drivers/robot/irobot_create/CMakeLists.txt
pkg/trunk/drivers/robot/katana/CMakeLists.txt
pkg/trunk/drivers/robot/pr2/point_cloud_assembler/CMakeLists.txt
pkg/trunk/drivers/robot/pr2/pr2_phase_space/CMakeLists.txt
pkg/trunk/drivers/robot/pr2/pr2_power_board/CMakeLists.txt
pkg/trunk/drivers/robot/segway_apox/CMakeLists.txt
pkg/trunk/drivers/robot/segway_apox/manifest.xml
pkg/trunk/drivers/robot/segway_apox/segway.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/CMakeLists.txt
pkg/trunk/estimation/robot_pose_ekf/CMakeLists.txt
pkg/trunk/grasp_module/grasp_learner/CMakeLists.txt
pkg/trunk/grasp_module/grasp_module/CMakeLists.txt
pkg/trunk/grasp_module/grasp_module_node/CMakeLists.txt
pkg/trunk/grasp_module/grasp_planner/CMakeLists.txt
pkg/trunk/grasp_module/object_detector/CMakeLists.txt
pkg/trunk/hardware_test/qualification/CMakeLists.txt
pkg/trunk/hardware_test/qualification/manifest.xml
pkg/trunk/hardware_test/runtime_monitor/CMakeLists.txt
pkg/trunk/hardware_test/self_test/CMakeLists.txt
pkg/trunk/highlevel/executive_python/CMakeLists.txt
pkg/trunk/highlevel/executive_trex/executive_trex_pr2/CMakeLists.txt
pkg/trunk/highlevel/executive_trex/executive_trex_pr2/include/Executive.hh
pkg/trunk/highlevel/executive_trex/executive_trex_pr2/src/Executive.cc
pkg/trunk/highlevel/executive_trex/executive_trex_pr2/src/WatchDog.cc
pkg/trunk/highlevel/highlevel_controllers/CMakeLists.txt
pkg/trunk/highlevel/highlevel_controllers/src/ControlCli.cpp
pkg/trunk/highlevel/highlevel_controllers/src/joy_batt_sender.cpp
pkg/trunk/highlevel/test_executive_trex_pr2/CMakeLists.txt
pkg/trunk/highlevel/test_highlevel_controllers/CMakeLists.txt
pkg/trunk/image_msgs/CMakeLists.txt
pkg/trunk/manip/arm_trajectory/arm_trajectory.cc
pkg/trunk/manip/spacenav_node/CMakeLists.txt
pkg/trunk/manip/teleop_arm_keyboard/CMakeLists.txt
pkg/trunk/mapping/cloud_geometry/CMakeLists.txt
pkg/trunk/mapping/cloud_io/CMakeLists.txt
pkg/trunk/mapping/cloud_kdtree/CMakeLists.txt
pkg/trunk/mapping/cloud_octree/CMakeLists.txt
pkg/trunk/mapping/collision_map/CMakeLists.txt
pkg/trunk/mapping/normal_estimation/CMakeLists.txt
pkg/trunk/mapping/planar_patch_map/CMakeLists.txt
pkg/trunk/mapping/point_cloud_downsampler/CMakeLists.txt
pkg/trunk/mapping/sample_consensus/CMakeLists.txt
pkg/trunk/mapping/semantic_point_annotator/CMakeLists.txt
pkg/trunk/mapping/stereo_convex_patch_histogram/CMakeLists.txt
pkg/trunk/mechanism/hardware_interface/CMakeLists.txt
pkg/trunk/mechanism/mechanism_control/CMakeLists.txt
pkg/trunk/mechanism/mechanism_control/manifest.xml
pkg/trunk/mechanism/mechanism_model/CMakeLists.txt
pkg/trunk/motion_planning/kinematic_planning/CMakeLists.txt
pkg/trunk/motion_planning/mp_benchmarks/CMakeLists.txt
pkg/trunk/motion_planning/mpbench/CMakeLists.txt
pkg/trunk/motion_planning/mpglue/CMakeLists.txt
pkg/trunk/motion_planning/navfn/CMakeLists.txt
pkg/trunk/motion_planning/ompl/CMakeLists.txt
pkg/trunk/motion_planning/planning_research/dynamic_planning/CMakeLists.txt
pkg/trunk/motion_planning/planning_research/robarm3d/CMakeLists.txt
pkg/trunk/motion_planning/sbpl/CMakeLists.txt
pkg/trunk/motion_planning/sbpl_util/CMakeLists.txt
pkg/trunk/motion_planning/test_collision_space/CMakeLists.txt
pkg/trunk/motion_planning/test_collision_space/src/test_cs.cpp
pkg/trunk/nav/amcl_player/CMakeLists.txt
pkg/trunk/nav/deadreckon/CMakeLists.txt
pkg/trunk/nav/fake_localization/CMakeLists.txt
pkg/trunk/nav/nav_view/CMakeLists.txt
pkg/trunk/nav/nav_view/manifest.xml
pkg/trunk/nav/nav_view_sdl/CMakeLists.txt
pkg/trunk/nav/sbpl_2dnav/CMakeLists.txt
pkg/trunk/nav/slam_gmapping/CMakeLists.txt
pkg/trunk/nav/teleop_base/CMakeLists.txt
pkg/trunk/nav/teleop_base_keyboard/CMakeLists.txt
pkg/trunk/nav/wavefront_player/CMakeLists.txt
pkg/trunk/nav/wavefront_player/cli.cpp
pkg/trunk/openrave_planning/openraveros/CMakeLists.txt
pkg/trunk/openrave_planning/orcollision/CMakeLists.txt
pkg/trunk/openrave_planning/orplugins/CMakeLists.txt
pkg/trunk/openrave_planning/orrosplanning/CMakeLists.txt
pkg/trunk/pr2_msgs/CMakeLists.txt
pkg/trunk/pr2_srvs/CMakeLists.txt
pkg/trunk/robot_control_loops/pr2_etherCAT/CMakeLists.txt
pkg/trunk/robot_control_loops/pr2_etherCAT/src/main.cpp
pkg/trunk/robot_descriptions/gazebo_robot_description/CMakeLists.txt
pkg/trunk/robot_descriptions/openrave_robot_description/CMakeLists.txt
pkg/trunk/robot_descriptions/wg_robot_description/CMakeLists.txt
pkg/trunk/robot_descriptions/wg_robot_description_parser/CMakeLists.txt
pkg/trunk/robot_msgs/CMakeLists.txt
pkg/trunk/robot_srvs/CMakeLists.txt
pkg/trunk/sandbox/axis_cam2/CMakeLists.txt
pkg/trunk/simulators/gazebo_map_extruder/CMakeLists.txt
pkg/trunk/simulators/nepumuk/Makefile
pkg/trunk/simulators/rosstage/CMakeLists.txt
pkg/trunk/trajectory_rollout/CMakeLists.txt
pkg/trunk/trajectory_rollout/include/trajectory_rollout/governor_node.h
pkg/trunk/trajectory_rollout/manifest.xml
pkg/trunk/util/angles/CMakeLists.txt
pkg/trunk/util/filter_coefficient_server/CMakeLists.txt
pkg/trunk/util/filter_demo/CMakeLists.txt
pkg/trunk/util/filters/CMakeLists.txt
pkg/trunk/util/kinematics/libKinematics/CMakeLists.txt
pkg/trunk/util/kinematics/robot_kinematics/CMakeLists.txt
pkg/trunk/util/laser_scan/CMakeLists.txt
pkg/trunk/util/logsetta/CMakeLists.txt
pkg/trunk/util/math_expr/CMakeLists.txt
pkg/trunk/util/message_sequencing/CMakeLists.txt
pkg/trunk/util/message_sequencing/example/testdelay.cpp
pkg/trunk/util/misc_utils/CMakeLists.txt
pkg/trunk/util/misc_utils/include/misc_utils/realtime_publisher.h
pkg/trunk/util/misc_utils/manifest.xml
pkg/trunk/util/mux/CMakeLists.txt
pkg/trunk/util/point_cloud_utils/CMakeLists.txt
pkg/trunk/util/point_cloud_utils/include/point_cloud_utils/timed_scan_assembler.h
pkg/trunk/util/profiling_utils/CMakeLists.txt
pkg/trunk/util/random_utils/CMakeLists.txt
pkg/trunk/util/resource_locator/CMakeLists.txt
pkg/trunk/util/robot_self_filter/CMakeLists.txt
pkg/trunk/util/robot_self_filter/manifest.xml
pkg/trunk/util/stl_utils/CMakeLists.txt
pkg/trunk/util/string_utils/CMakeLists.txt
pkg/trunk/util/tf/CMakeLists.txt
pkg/trunk/util/trajectory/CMakeLists.txt
pkg/trunk/vision/borg/CMakeLists.txt
pkg/trunk/vision/calib_converter/CMakeLists.txt
pkg/trunk/vision/calonder_descriptor/CMakeLists.txt
pkg/trunk/vision/camera_grab_samples/bumblebee_grab_sample/CMakeLists.txt
pkg/trunk/vision/checkerboard_detector/CMakeLists.txt
pkg/trunk/vision/color_calib/CMakeLists.txt
pkg/trunk/vision/cv_cam_calib/CMakeLists.txt
pkg/trunk/vision/cv_view/CMakeLists.txt
pkg/trunk/vision/cv_view/src/cv_view.cpp
pkg/trunk/vision/cv_view/src/cv_view_array.cpp
pkg/trunk/vision/cv_view/src/cv_view_array_overlay.cpp
pkg/trunk/vision/dorylus/CMakeLists.txt
pkg/trunk/vision/gmmseg/CMakeLists.txt
pkg/trunk/vision/laser_processor/CMakeLists.txt
pkg/trunk/vision/laser_processor/laser_processor.cpp
pkg/trunk/vision/mech_turk/CMakeLists.txt
pkg/trunk/vision/mrf_image_classifier/CMakeLists.txt
pkg/trunk/vision/outlet_detection/CMakeLists.txt
pkg/trunk/vision/people/CMakeLists.txt
pkg/trunk/vision/people/src/calc_leg_features.cpp
pkg/trunk/vision/people/src/leg_detector.cpp
pkg/trunk/vision/place_recognition/CMakeLists.txt
pkg/trunk/vision/render/CMakeLists.txt
pkg/trunk/vision/scan_utils/CMakeLists.txt
pkg/trunk/vision/spacetime_stereo/CMakeLists.txt
pkg/trunk/vision/star_detector/CMakeLists.txt
pkg/trunk/vision/stereo_blob_tracker/CMakeLists.txt
pkg/trunk/vision/stereo_calib/CMakeLists.txt
pkg/trunk/vision/stereo_capture/CMakeLists.txt
pkg/trunk/vision/stereo_image_proc/CMakeLists.txt
pkg/trunk/vision/stereo_utils/CMakeLists.txt
pkg/trunk/vision/stereo_view/CMakeLists.txt
pkg/trunk/vision/vision_utils/CMakeLists.txt
pkg/trunk/vision/visual_odometry/CMakeLists.txt
pkg/trunk/vision/vslam/CMakeLists.txt
pkg/trunk/visualization/log_gui/CMakeLists.txt
pkg/trunk/visualization/ogre_tools/CMakeLists.txt
pkg/trunk/visualization/ogre_tools/manifest.xml
pkg/trunk/visualization/ogre_visualizer/CMakeLists.txt
pkg/trunk/visualization/ogre_visualizer/manifest.xml
pkg/trunk/visualization/ogre_visualizer/src/test/marker_test.cpp
pkg/trunk/visualization/scene_labeler/CMakeLists.txt
pkg/trunk/visualization/wx_camera_panel/CMakeLists.txt
pkg/trunk/visualization/wx_rosout/CMakeLists.txt
pkg/trunk/visualization/wx_topic_display/CMakeLists.txt
pkg/trunk/world_models/costmap_2d/CMakeLists.txt
pkg/trunk/world_models/costmap_2d/include/costmap_2d/basic_observation_buffer.h
pkg/trunk/world_models/costmap_2d/manifest.xml
pkg/trunk/world_models/fake_world_3d_map/CMakeLists.txt
pkg/trunk/world_models/map_saver/CMakeLists.txt
pkg/trunk/world_models/map_server/CMakeLists.txt
pkg/trunk/world_models/map_server/src/main.cpp
pkg/trunk/world_models/map_server/test/rtest.cpp
pkg/trunk/world_models/ransac_ground_plane_extraction/CMakeLists.txt
pkg/trunk/world_models/robot_models/collision_space/CMakeLists.txt
pkg/trunk/world_models/robot_models/planning_models/CMakeLists.txt
pkg/trunk/world_models/robot_models/robot_filter/CMakeLists.txt
pkg/trunk/world_models/robot_models/robot_model/CMakeLists.txt
pkg/trunk/world_models/static_map_server/CMakeLists.txt
pkg/trunk/world_models/topological_map/CMakeLists.txt
pkg/trunk/world_models/voxel_grid/CMakeLists.txt
pkg/trunk/world_models/world_3d_map/CMakeLists.txt
Added Paths:
-----------
pkg/trunk/3rdparty/opencv_latest/cmake_2.4.6.patch
pkg/trunk/3rdparty/player/cmake-2.4-ros.patch
pkg/trunk/util/realtime_thread/
pkg/trunk/util/realtime_thread/CMakeLists.txt
pkg/trunk/util/realtime_thread/Makefile
pkg/trunk/util/realtime_thread/include/
pkg/trunk/util/realtime_thread/include/asm/
pkg/trunk/util/realtime_thread/include/asm/arith.h
pkg/trunk/util/realtime_thread/include/asm/arith_32.h
pkg/trunk/util/realtime_thread/include/asm/arith_64.h
pkg/trunk/util/realtime_thread/include/asm/atomic.h
pkg/trunk/util/realtime_thread/include/asm/atomic_32.h
pkg/trunk/util/realtime_thread/include/asm/atomic_64.h
pkg/trunk/util/realtime_thread/include/asm/bits/
pkg/trunk/util/realtime_thread/include/asm/bits/heap.h
pkg/trunk/util/realtime_thread/include/asm/bits/init.h
pkg/trunk/util/realtime_thread/include/asm/bits/init_32.h
pkg/trunk/util/realtime_thread/include/asm/bits/init_64.h
pkg/trunk/util/realtime_thread/include/asm/bits/intr.h
pkg/trunk/util/realtime_thread/include/asm/bits/pod.h
pkg/trunk/util/realtime_thread/include/asm/bits/pod_32.h
pkg/trunk/util/realtime_thread/include/asm/bits/pod_64.h
pkg/trunk/util/realtime_thread/include/asm/bits/shadow.h
pkg/trunk/util/realtime_thread/include/asm/bits/shadow_32.h
pkg/trunk/util/realtime_thread/include/asm/bits/shadow_64.h
pkg/trunk/util/realtime_thread/include/asm/bits/thread.h
pkg/trunk/util/realtime_thread/include/asm/bits/thread_32.h
pkg/trunk/util/realtime_thread/include/asm/bits/thread_64.h
pkg/trunk/util/realtime_thread/include/asm/bits/timer.h
pkg/trunk/util/realtime_thread/include/asm/calibration.h
pkg/trunk/util/realtime_thread/include/asm/features.h
pkg/trunk/util/realtime_thread/include/asm/features_32.h
pkg/trunk/util/realtime_thread/include/asm/features_64.h
pkg/trunk/util/realtime_thread/include/asm/fptest.h
pkg/trunk/util/realtime_thread/include/asm/hal.h
pkg/trunk/util/realtime_thread/include/asm/hal_32.h
pkg/trunk/util/realtime_thread/include/asm/hal_64.h
pkg/trunk/util/realtime_thread/include/asm/smi.h
pkg/trunk/util/realtime_thread/include/asm/switch.h
pkg/trunk/util/realtime_thread/include/asm/switch_32.h
pkg/trunk/util/realtime_thread/include/asm/switch_64.h
pkg/trunk/util/realtime_thread/include/asm/syscall.h
pkg/trunk/util/realtime_thread/include/asm/syscall_32.h
pkg/trunk/util/realtime_thread/include/asm/syscall_64.h
pkg/trunk/util/realtime_thread/include/asm/system.h
pkg/trunk/util/realtime_thread/include/asm/system_32.h
pkg/trunk/util/realtime_thread/include/asm/system_64.h
pkg/trunk/util/realtime_thread/include/asm/wrappers.h
pkg/trunk/util/realtime_thread/include/asm/wrappers_32.h
pkg/trunk/util/realtime_thread/include/asm/wrappers_64.h
pkg/trunk/util/realtime_thread/include/asm/xenomai
pkg/trunk/util/realtime_thread/include/asm-generic/
pkg/trunk/util/realtime_thread/include/asm-generic/arith.h
pkg/trunk/util/realtime_thread/include/asm-generic/bits/
pkg/trunk/util/realtime_thread/include/asm-generic/bits/bind.h
pkg/trunk/util/realtime_thread/include/asm-generic/bits/heap.h
pkg/trunk/util/realtime_thread/include/asm-generic/bits/intr.h
pkg/trunk/util/realtime_thread/include/asm-generic/bits/mlock_alert.h
pkg/trunk/util/realtime_thread/include/asm-generic/bits/pod.h
pkg/trunk/util/realtime_thread/include/asm-generic/features.h
pkg/trunk/util/realtime_thread/include/asm-generic/hal.h
pkg/trunk/util/realtime_thread/include/asm-generic/syscall.h
pkg/trunk/util/realtime_thread/include/asm-generic/system.h
pkg/trunk/util/realtime_thread/include/asm-generic/wrappers.h
pkg/trunk/util/realtime_thread/include/asm-generic/xenomai
pkg/trunk/util/realtime_thread/include/native/
pkg/trunk/util/realtime_thread/include/native/alarm.h
pkg/trunk/util/realtime_thread/include/native/cond.h
pkg/trunk/util/realtime_thread/include/native/event.h
pkg/trunk/util/realtime_thread/include/native/heap.h
pkg/trunk/util/realtime_thread/include/native/intr.h
pkg/trunk/util/realtime_thread/include/native/misc.h
pkg/trunk/util/realtime_thread/include/native/mutex.h
pkg/trunk/util/realtime_thread/include/native/pipe.h
pkg/trunk/util/realtime_thread/include/native/ppd.h
pkg/trunk/util/realtime_thread/include/native/queue.h
pkg/trunk/util/realtime_thread/include/native/sem.h
pkg/trunk/util/realtime_thread/include/native/syscall.h
pkg/trunk/util/realtime_thread/include/native/task.h
pkg/trunk/util/realtime_thread/include/native/timer.h
pkg/trunk/util/realtime_thread/include/native/types.h
pkg/trunk/util/realtime_thread/include/nucleus/
pkg/trunk/util/realtime_thread/include/nucleus/assert.h
pkg/trunk/util/realtime_thread/include/nucleus/bheap.h
pkg/trunk/util/realtime_thread/include/nucleus/compiler.h
pkg/trunk/util/realtime_thread/include/nucleus/core.h
pkg/trunk/util/realtime_thread/include/nucleus/heap.h
pkg/trunk/util/realtime_thread/include/nucleus/intr.h
pkg/trunk/util/realtime_thread/include/nucleus/jhash.h
pkg/trunk/util/realtime_thread/include/nucleus/map.h
pkg/trunk/util/realtime_thread/include/nucleus/module.h
pkg/trunk/util/realtime_thread/include/nucleus/pipe.h
pkg/trunk/util/realtime_thread/include/nucleus/pod.h
pkg/trunk/util/realtime_thread/include/nucleus/ppd.h
pkg/trunk/util/realtime_thread/include/nucleus/queue.h
pkg/trunk/util/realtime_thread/include/nucleus/registry.h
pkg/trunk/util/realtime_thread/include/nucleus/select.h
pkg/trunk/util/realtime_thread/include/nucleus/shadow.h
pkg/trunk/util/realtime_thread/include/nucleus/stat.h
pkg/trunk/util/realtime_thread/include/nucleus/synch.h
pkg/trunk/util/realtime_thread/include/nucleus/system.h
pkg/trunk/util/realtime_thread/include/nucleus/thread.h
pkg/trunk/util/realtime_thread/include/nucleus/timebase.h
pkg/trunk/util/realtime_thread/include/nucleus/timer.h
pkg/trunk/util/realtime_thread/include/nucleus/trace.h
pkg/trunk/util/realtime_thread/include/nucleus/types.h
pkg/trunk/util/realtime_thread/include/nucleus/version.h
pkg/trunk/util/realtime_thread/include/nucleus/xenomai.h
pkg/trunk/util/realtime_thread/include/realtime_thread/
pkg/trunk/util/realtime_thread/include/realtime_thread/realtime_thread.h
pkg/trunk/util/realtime_thread/include/xeno_config.h
pkg/trunk/util/realtime_thread/manifest.xml
pkg/trunk/util/realtime_thread/src/
pkg/trunk/util/realtime_thread/src/realtime_thread.cpp
Property Changed:
----------------
pkg/trunk/
Property changes on: pkg/trunk
___________________________________________________________________
Modified: svk:merge
- 637b03a7-42c1-4bbd-8d43-e365e379942c:/rosTF_to_tf:9746
920d6130-5740-4ec1-bb1a-45963d5fd813:/frameidpr:7015
920d6130-5740-4ec1-bb1a-45963d5fd813:/users/josh-pr:11755
920d6130-5740-4ec1-bb1a-45963d5fd813:/wgpkgtrunk:5865
f5854215-dd47-0410-b2c4-cdd35faa7885:/pkg/branches/josh:6549
f5854215-dd47-0410-b2c4-cdd35faa7885:/pkg/branches/rosbus:261
+ 637b03a7-42c1-4bbd-8d43-e365e379942c:/rosTF_to_tf:9746
920d6130-5740-4ec1-bb1a-45963d5fd813:/frameidpr:7015
920d6130-5740-4ec1-bb1a-45963d5fd813:/users/josh-pr:11755
920d6130-5740-4ec1-bb1a-45963d5fd813:/wgpkgtrunk:5865
f5854215-dd47-0410-b2c4-cdd35faa7885:/pkg/branches/josh:9316
f5854215-dd47-0410-b2c4-cdd35faa7885:/pkg/branches/rosbus:261
Modified: pkg/trunk/3rdparty/ANN/Makefile
===================================================================
--- pkg/trunk/3rdparty/ANN/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/ANN/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,4 +1,4 @@
-all: ann
+all: installed
TARBALL = build/ann_1.1.1.tar.gz
TARBALL_URL = http://www.cs.umd.edu/~mount/ANN/Files/1.1.1/ann_1.1.1.tar.gz
@@ -8,8 +8,9 @@
include $(shell rospack find mk)/download_unpack_build.mk
-ann: $(SOURCE_DIR)
+installed: $(SOURCE_DIR) Makefile
echo "Building FL-ANN..."
cd build/ann_1.1.1 && make linux-shared-g++
+ touch installed
wipe:
- rm -rf build
+ rm -rf build installed
Modified: pkg/trunk/3rdparty/FL-ANN/Makefile
===================================================================
--- pkg/trunk/3rdparty/FL-ANN/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/FL-ANN/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,4 +1,4 @@
-all: fl-ann
+all: installed
TARBALL = build/flann-1.11-src.zip
TARBALL_URL = http://pr.willowgarage.com/downloads/flann-1.11-src.zip
@@ -8,9 +8,14 @@
include $(shell rospack find mk)/download_unpack_build.mk
-fl-ann: $(SOURCE_DIR)
+installed: wiped $(SOURCE_DIR)
echo "Building FL-ANN..."
mkdir -p build/build && cd build/build && cmake ../flann-1.11-src/src && make
+ touch installed
+wiped: Makefile
+ make wipe
+ touch wiped
+
wipe:
- rm -rf build
+ rm -rf build installed
Modified: pkg/trunk/3rdparty/bfl/Makefile
===================================================================
--- pkg/trunk/3rdparty/bfl/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/bfl/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,36 +1,26 @@
-.PHONY: $(SVN_DIR) bfl
+all: installed
-all: bfl
-
SVN_REVISION= -r 29808
SVN_DIR = bfl-svn
SVN_URL = http://svn.mech.kuleuven.be:/repos/orocos/trunk/bfl
INSTALL_DIR = bfl-boost
-CMAKE = `rospack find cmake`/cmake/bin/cmake
+CMAKE = cmake
BOOST_ROOT =$(shell rospack find boost)/boost
CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(PWD)/$(INSTALL_DIR)/ \
-DMATRIX_LIB=boost -DRNG_LIB=boost -DBOOST_FOUND=`rospack find boost`/boost/include/
include $(shell rospack find mk)/svn_checkout.mk
-
-
-build: wiped bfl
-
-
-configured: SVN_UP Makefile
+installed: $(SVN_DIR) patched
mkdir -p $(SVN_DIR)/build-boost
cd $(SVN_DIR)/build-boost && $(CMAKE) $(CMAKE_ARGS) ..
- touch configured
-
-
-bfl: configured
cd $(SVN_DIR)/build-boost && make $(PARALLEL_JOBS) && make install
+ touch installed
clean:
rm -rf $(INSTALL_DIR)
rm -rf $(SVN_DIR)
- rm -rf configured
+ rm -rf installed
#test:
-# cd $(SVN_DIR)/build-boost && make check
\ No newline at end of file
+# cd $(SVN_DIR)/build-boost && make check
Modified: pkg/trunk/3rdparty/bullet/Makefile
===================================================================
--- pkg/trunk/3rdparty/bullet/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/bullet/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,4 +1,4 @@
-all: build
+all: installed
SVN_DIR = bullet_svn
SVN_URL = http://bullet.googlecode.com/svn/trunk/
@@ -10,15 +10,42 @@
.PHONY: build
-build: SVN_UP_REVERT_PATCH
- cd $(SVN_DIR) && $(shell rospack find cmake)/cmake/bin/cmake -DCMAKE_INSTALL_PREFIX=$(PWD) .
- cd $(SVN_DIR) && make $(PARALLEL_JOBS) && make $(PARALLEL_JOBS) install
- touch bullet
+# Poor man's installation procedure setup
+BULLET_LIBS = $(SVN_DIR)/src/BulletCollision/libBulletCollision.a \
+ $(SVN_DIR)/src/BulletDynamics/libBulletDynamics.a \
+ $(SVN_DIR)/src/BulletSoftBody/libBulletSoftBody.a \
+ $(SVN_DIR)/src/LinearMath/libLinearMath.a
+BULLET_INC_DIRS = BulletSoftBody \
+ BulletCollision/CollisionShapes \
+ BulletCollision/BroadphaseCollision \
+ BulletCollision/NarrowPhaseCollision \
+ BulletCollision/CollisionDispatch \
+ BulletCollision/Gimpact \
+ BulletDynamics/ConstraintSolver \
+ BulletDynamics/Vehicle \
+ BulletDynamics/Dynamics \
+ BulletDynamics/Character \
+ LinearMath \
+
+installed: $(SVN_DIR) patched
+ cd $(SVN_DIR) && cmake -DCMAKE_INSTALL_PREFIX=$(PWD) .
+ # Bullet appears not be parallel-make safe
+ #cd $(SVN_DIR) && make $(PARALLEL_JOBS)
+ cd $(SVN_DIR) && make
+ # The 'install' target only works with cmake 2.6 for some reason
+ #cd $(SVN_DIR) && make $(PARALLEL_JOBS) install
+ mkdir -p lib
+ cp $(BULLET_LIBS) lib
+ mkdir -p include
+ $(foreach d,$(BULLET_INC_DIRS), mkdir -p include/$(d) && cp $(SVN_DIR)/src/$(d)/*.h include/$(d);)
+ touch installed
+
clean:
+ rm -f installed
-make -C $(SVN_DIR) clean
-wipe:
- -rm -f bullet patched
+wipe: clean
+ -rm -f patched
-rm -rf bullet_svn
-rm -rf build
Modified: pkg/trunk/3rdparty/convex_decomposition/Makefile
===================================================================
--- pkg/trunk/3rdparty/convex_decomposition/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/convex_decomposition/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,31 +1,33 @@
-all: convex_decomposition
+all: installed
TARBALL = build/ConvexDecomposition.zip
TARBALL_URL = http://www.amillionpixels.us/ConvexDecomposition.zip
SOURCE_DIR = build/convex_decomposition
INITIAL_DIR = build/ConvexDecomposition
UNPACK_CMD = unzip
+TARBALL_PATCH=convex_decomposition.patch
include $(shell rospack find mk)/download_unpack_build.mk
-PATCH=convex_decomposition.patch
ROOT = $(shell rospack find convex_decomposition)/convex_decomposition
-convex_decomposition: $(SOURCE_DIR)
+installed: wiped $(SOURCE_DIR)
@echo "making it"
@echo "ROOT is: $(ROOT)"
-mkdir -p $(ROOT)
-mkdir -p $(ROOT)/bin
- -cd $(SOURCE_DIR) && rm -f Makefile #remove if exist, to avoid appending Makefile twice
- cd $(SOURCE_DIR) ; patch -p0 -N < ../../convex_decomposition.patch || echo
cd $(SOURCE_DIR) ; make $(PARALLEL_JOBS); make install
+ touch installed
+wiped: Makefile
+ make wipe
+ touch wiped
+
clean:
-cd $(SOURCE_DIR) && make clean
- rm -rf $(ROOT)
+ rm -rf $(ROOT) installed
-wipe:
+wipe: clean
rm -rf build
- rm -rf $(ROOT)
.PHONY : clean download wipe
Modified: pkg/trunk/3rdparty/eigen/Makefile
===================================================================
--- pkg/trunk/3rdparty/eigen/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/eigen/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -8,3 +8,9 @@
include $(shell rospack find mk)/download_unpack_build.mk
eigen: $(SOURCE_DIR)
+
+clean:
+ rm -rf $(SOURCE_DIR)
+
+wipe: clean
+ rm -rf build
\ No newline at end of file
Modified: pkg/trunk/3rdparty/eml/Makefile
===================================================================
--- pkg/trunk/3rdparty/eml/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/eml/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,4 +1,4 @@
-all: build
+all: installed
TARBALL = build/eml-r36-patched.tar.bz2
TARBALL_URL = http://pr.willowgarage.com/downloads/eml-r36-patched.tar.bz2
@@ -6,26 +6,21 @@
UNPACK_CMD = tar xjf
include $(shell rospack find mk)/download_unpack_build.mk
-build: wiped eml
-
-configured: $(SOURCE_DIR) Makefile
+installed: wiped $(SOURCE_DIR) Makefile
cd $(SOURCE_DIR) && \
mkdir -p build && \
cd build && \
- `rospack find cmake`/cmake/bin/cmake -D RTNET_INSTALL_PATH=`rospack find rtnet`/rtnet -D XENOMAI_INSTALL_PATH=`rospack find xenomai`/xenomai -D CMAKE_INSTALL_PREFIX=`rospack find eml`/eml .. && \
- touch configured
+ cmake -D RTNET_INSTALL_PATH=`rospack find rtnet`/rtnet -D XENOMAI_INSTALL_PATH=`rospack find xenomai`/xenomai -D CMAKE_INSTALL_PREFIX=`rospack find eml`/eml .. && \
+ make install
+ touch installed
wiped: Makefile
make wipe
touch wiped
-.PHONY: eml
-eml: configured
- make -C $(SOURCE_DIR)/build install
-
clean:
-make -C $(SOURCE_DIR)/build clean
- rm -rf eml configured
+ rm -rf eml installed
wipe: clean
rm -rf build
Modified: pkg/trunk/3rdparty/estar/Makefile
===================================================================
--- pkg/trunk/3rdparty/estar/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/estar/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -14,7 +14,8 @@
# $ make svn-all
##all: tarball-all
-all: svn-all
+#all: svn-all
+all: installed
VERSION= r267
@@ -27,11 +28,20 @@
BOOST_DIR= `rospack cflags-only-I boost`
SVN_DIR= $(PWD)/build/estar-svn
-SVN_REV= HEAD
+SVN_REVISION= -r 276
SVN_URL= https://estar.svn.sourceforge.net/svnroot/estar/trunk/estar
-include $(shell rospack find mk)/download_unpack_build.mk
+#include $(shell rospack find mk)/download_unpack_build.mk
+include $(shell rospack find mk)/svn_checkout.mk
+installed: $(SVN_DIR) patched
+ cd $(SVN_DIR) && ./bootstrap-buildsystem.sh
+ test -d $(BUILD_DIR) || mkdir -p $(BUILD_DIR)
+ cd $(BUILD_DIR) && $(SVN_DIR)/configure --prefix=$(INST_DIR) \
+ --with-boost=$(BOOST_DIR)
+ $(MAKE) -C $(BUILD_DIR) install
+ touch installed
+
.PHONY: reall-all
really-all: $(SOURCE_DIR)/configure $(BUILD_DIR)/config.h
$(MAKE) -C $(BUILD_DIR) install
@@ -42,7 +52,7 @@
checkout_or_update:
- test -d $(SVN_DIR) && svn up $(SVN_DIR)
- test -d $(SVN_DIR) || svn co -r$(SVN_REV) $(SVN_URL) $(SVN_DIR)
+ test -d $(SVN_DIR) || svn co $(SVN_REVISION) $(SVN_URL) $(SVN_DIR)
.PHONY: tarball-all
tarball-all: $(SOURCE_DIR)
@@ -59,10 +69,11 @@
--with-boost=$(BOOST_DIR)
clean:
- $(MAKE) -C $(BUILD_DIR) clean
+ -$(MAKE) -C $(BUILD_DIR) clean
+ rm -f installed
distclean:
$(MAKE) -C $(BUILD_DIR) distclean
-wipe:
- rm -rf $(BUILD_DIR) $(INST_DIR)
+wipe: clean
+ rm -rf build $(INST_DIR)
Modified: pkg/trunk/3rdparty/fast_detector/CMakeLists.txt
===================================================================
--- pkg/trunk/3rdparty/fast_detector/CMakeLists.txt 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/fast_detector/CMakeLists.txt 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 2.6)
-include(rosbuild)
+cmake_minimum_required(VERSION 2.4.6)
+include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
set(ROS_BUILD_TYPE Release)
rospack(fast_detector)
rospack_add_library(fast_detector src/fast_10.c src/fast_11.c src/fast_12.c src/fast_9.c src/nonmax.c)
Modified: pkg/trunk/3rdparty/freeimage/Makefile
===================================================================
--- pkg/trunk/3rdparty/freeimage/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/freeimage/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,4 +1,4 @@
-all: freeimage
+all: installed
TARBALL = build/FreeImage3110.zip
TARBALL_URL = http://pr.willowgarage.com/downloads/FreeImage3110.zip
@@ -9,7 +9,7 @@
ROOT = $(shell rospack find freeimage)/freeimage
-freeimage: $(SOURCE_DIR)
+installed: $(SOURCE_DIR) Makefile
@echo "making it"
@echo "ROOT is: $(ROOT)"
-mkdir -p freeimage
@@ -29,13 +29,13 @@
cd $(SOURCE_DIR) ; make $(PARALLEL_JOBS); make install
mkdir -p freeimage/lib/pkgconfig
sed 's%FREEIMAGE_PATH%$(shell rospack find freeimage)%g' freeimage.pc > freeimage/lib/pkgconfig/freeimage.pc
+ touch installed
clean:
-cd freeimage-3.11.0 && make clean
- rm -rf freeimage
+ rm -rf installed
-wipe:
- rm -rf freeimage
+wipe: clean
rm -rf build
.PHONY : clean download wipe
Modified: pkg/trunk/3rdparty/glc/elfhacks/Makefile
===================================================================
--- pkg/trunk/3rdparty/glc/elfhacks/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/glc/elfhacks/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,4 +1,4 @@
-all: elfhacks
+all: installed
TARBALL = build/elfhacks-0.4.1.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/elfhacks-0.4.1.tar.gz
@@ -6,11 +6,12 @@
UNPACK_CMD = tar xzf
include $(shell rospack find mk)/download_unpack_build.mk
-elfhacks: $(SOURCE_DIR)
+installed: $(SOURCE_DIR) Makefile
-mv build/elfhacks $(SOURCE_DIR)
cd $(SOURCE_DIR) && cmake . -DCMAKE_INSTALL_PREFIX:PATH="`rospack find glc`" -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -msse -mmmx -fomit-frame-pointer" -DCMAKE_INSTALL_RPATH:STRING="`rospack find glc`/lib" && make && make install
+ touch installed
clean:
- rm -rf $(SOURCE_DIR)
+ rm -rf $(SOURCE_DIR) installed
wipe: clean
rm -rf $(TARBALL) build
Modified: pkg/trunk/3rdparty/glc/glc/Makefile
===================================================================
--- pkg/trunk/3rdparty/glc/glc/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/glc/glc/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,4 +1,4 @@
-all: glc
+all: installed
TARBALL = build/glc-0.5.7.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/glc-0.5.7.tar.gz
@@ -6,11 +6,12 @@
UNPACK_CMD = tar xzf
include $(shell rospack find mk)/download_unpack_build.mk
-glc: $(SOURCE_DIR)
+installed: $(SOURCE_DIR) Makefile
-mv build/glc $(SOURCE_DIR)
- cd $(SOURCE_DIR) && cmake . -DCMAKE_INSTALL_PREFIX:PATH="`rospack find glc`" -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -msse -mmmx -fomit-frame-pointer" -DCMAKE_INSTALL_RPATH:STRING="`rospack find glc`/lib" && make && make install
+ cd $(SOURCE_DIR) && cmake . -DCMAKE_INSTALL_PREFIX:PATH="`rospack find glc`" -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -msse -mmmx -fomit-frame-pointer" -DCMAKE_INSTALL_RPATH:STRING="`rospack find glc`/lib" -DELFHACKS_LIBRARY=$(PWD)/../lib/libelfhacks.so -DELFHACKS_INCLUDE_DIR=$(PWD)/../include -DPACKETSTREAM_LIBRARY=$(PWD)/../lib/libpacketstream.so -DPACKETSTREAM_INCLUDE_DIR=$(PWD)/../include && make && make install
+ touch installed
clean:
- rm -rf $(SOURCE_DIR)
+ rm -rf $(SOURCE_DIR) installed
wipe: clean
rm -rf $(TARBALL) build
Modified: pkg/trunk/3rdparty/glc/packetstream/Makefile
===================================================================
--- pkg/trunk/3rdparty/glc/packetstream/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/glc/packetstream/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,4 +1,4 @@
-all: packetstream
+all: installed
TARBALL = build/packetstream-0.1.4.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/packetstream-0.1.4.tar.gz
@@ -6,11 +6,12 @@
UNPACK_CMD = tar xzf
include $(shell rospack find mk)/download_unpack_build.mk
-packetstream: $(SOURCE_DIR)
+installed: $(SOURCE_DIR) Makefile
-mv build/packetstream packetstream-0.1.4
cd $(SOURCE_DIR) && cmake . -DCMAKE_INSTALL_PREFIX:PATH="`rospack find glc`" -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -msse -mmmx -fomit-frame-pointer" -DCMAKE_INSTALL_RPATH:STRING="`rospack find glc`/lib" && make && make install
+ touch installed
clean:
- rm -rf $(SOURCE_DIR)
+ rm -rf $(SOURCE_DIR) installed
wipe: clean
rm -rf $(TARBALL) build
Modified: pkg/trunk/3rdparty/gmapping/Makefile
===================================================================
--- pkg/trunk/3rdparty/gmapping/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/gmapping/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,4 +1,4 @@
-all: build
+all: installed
TARBALL = build/gmapping_r39.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/gmapping_r39.tar.gz
@@ -8,22 +8,10 @@
PATCH = gmapping-r39.patch
-build: wiped install
-
-configured: $(SOURCE_DIR) Makefile
+installed: wiped $(SOURCE_DIR)
cd $(SOURCE_DIR) && patch -p0 < ../../$(PATCH) && ./configure
- touch configured
-
-wiped: Makefile $(PATCH)
- make wipe
- touch wiped
-
-.PHONY: gmapping
-gmapping: configured
cd $(SOURCE_DIR) && make
-
-# Poor-man's install step
-install: gmapping
+ # Poor-man's install step
mkdir -p lib
cp $(SOURCE_DIR)/lib/* lib
mkdir -p include/gmapping/sensor/sensor_range
@@ -44,10 +32,15 @@
cp $(SOURCE_DIR)/scanmatcher/*.h include/gmapping/scanmatcher
cp $(SOURCE_DIR)/log/*.h include/gmapping/log
cp $(SOURCE_DIR)/grid/*.h include/gmapping/grid
+ touch installed
+wiped: Makefile $(PATCH)
+ make wipe
+ touch wiped
+
clean:
-cd $(SOURCE_DIR) && make clean
- rm -rf include lib configured
+ rm -rf include lib installed
wipe: clean
rm -rf build
Modified: pkg/trunk/3rdparty/ivcon/CMakeLists.txt
===================================================================
--- pkg/trunk/3rdparty/ivcon/CMakeLists.txt 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/ivcon/CMakeLists.txt 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 2.6)
-include(rosbuild)
+cmake_minimum_required(VERSION 2.4.6)
+include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(ivcon)
#uncomment for profiling
Modified: pkg/trunk/3rdparty/kdl/Makefile
===================================================================
--- pkg/trunk/3rdparty/kdl/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/kdl/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,7 +1,5 @@
-.PHONY: kdl
+all: installed
-all: build
-
TARBALL = build/kdl_29562.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/kdl_29562.tar.gz
SOURCE_DIR = build/kdl_export
@@ -9,14 +7,11 @@
UNPACK_CMD = tar xzf
include $(shell rospack find mk)/download_unpack_build.mk
-
-
-
PATCH1 = kdl_patch29562.diff
PATCH2 = kdl_patch_quaternion.diff
include $(shell rospack find mk)/svn_checkout.mk
-CMAKE = `rospack find cmake`/cmake/bin/cmake
+CMAKE = cmake
BOOST_ROOT =$(shell rospack find boost)/boost
CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(PWD)/kdl/ \
-DPYTHON_BINDINGS=OFF \
@@ -24,26 +19,21 @@
-DBOOST_INCLUDEDIR:STRING=$(BOOST_ROOT)/include \
-DBOOST_LIBRARYDIR:STRING=$(BOOST_ROOT)/lib
-build: wiped kdl
-
-configured: $(SOURCE_DIR) Makefile
+installed: wiped $(SOURCE_DIR)
-cd $(SOURCE_DIR) && patch -p0 <../../$(PATCH1)
-cd $(SOURCE_DIR) && patch -p0 <../../$(PATCH2)
-mkdir -p $(SOURCE_DIR)/build
cd $(SOURCE_DIR)/build && $(CMAKE) $(CMAKE_ARGS) ..
- touch configured
+ cd $(SOURCE_DIR)/build && make $(PARALLEL_JOBS) && make install
+ touch installed
wiped: Makefile
make wipe
touch wiped
-kdl: configured
- #cd $(SOURCE_DIR)/build && make $(PARALLEL_JOBS) && make python && make install
- cd $(SOURCE_DIR)/build && make $(PARALLEL_JOBS) && make install
-
clean:
rm -rf $(SOURCE_DIR)
- rm -rf configured
+ rm -rf installed
wipe: clean
rm -rf $(TARBALL) build
Modified: pkg/trunk/3rdparty/libbk_maxflow/CMakeLists.txt
===================================================================
--- pkg/trunk/3rdparty/libbk_maxflow/CMakeLists.txt 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/libbk_maxflow/CMakeLists.txt 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,3 +1,3 @@
-cmake_minimum_required(VERSION 2.6)
-include(rosbuild)
+cmake_minimum_required(VERSION 2.4.6)
+include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(libbk_maxflow)
Modified: pkg/trunk/3rdparty/libdc1394v2/Makefile
===================================================================
--- pkg/trunk/3rdparty/libdc1394v2/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/libdc1394v2/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,4 +1,4 @@
-all: build
+all: installed
SVN_DIR = libdc1394v2-svn
SVN_URL = https://libdc1394.svn.sourceforge.net/svnroot/libdc1394/trunk/libdc1394
@@ -6,22 +6,20 @@
SVN_PATCH = videre_fix.patch
include $(shell rospack find mk)/svn_checkout.mk
-build: SVN_UP_REVERT_PATCH libdc1394v2
-
-configured: $(SVN_DIR) Makefile
+installed: wiped $(SVN_DIR) patched
cd $(SVN_DIR) && autoreconf -i -s
cd $(SVN_DIR) && CFLAGS="-g -O2 -fPIC" ./configure --prefix=$(PWD)/libdc1394v2 --enable-shared=no
- touch configured
-
-.PHONY: libdc1394v2
-libdc1394v2: configured
cd $(SVN_DIR) && ln -fs /usr/bin/libtool
cd $(SVN_DIR) && make
cd $(SVN_DIR) && make install
- touch libdc1394v2
+ touch installed
+wiped: Makefile
+ make wipe
+ touch wiped
+
clean:
- rm -rf libdc1394v2 configured
+ rm -rf libdc1394v2 installed wiped
wipe: clean
rm -rf $(SVN_DIR)
Modified: pkg/trunk/3rdparty/libfz_ht_superpixels/CMakeLists.txt
===================================================================
--- pkg/trunk/3rdparty/libfz_ht_superpixels/CMakeLists.txt 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/libfz_ht_superpixels/CMakeLists.txt 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 2.6)
-include(rosbuild)
+cmake_minimum_required(VERSION 2.4.6)
+include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(libfz_ht_superpixels)
include_directories(src)
rospack_add_library(fz_ht_superpixels
Modified: pkg/trunk/3rdparty/libsunflower/Makefile
===================================================================
--- pkg/trunk/3rdparty/libsunflower/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/libsunflower/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -15,7 +15,8 @@
# $ make svn-all
##all: tarball-all
-all: svn-all
+#all: svn-all
+all: installed
VERSION= r910
@@ -29,11 +30,22 @@
BOOST_DIR= `rospack cflags-only-I boost`
SVN_DIR= $(PWD)/build/sunflower-svn
-SVN_REV= HEAD
+SVN_REVISION= -r 960
SVN_URL= https://libsunflower.svn.sourceforge.net/svnroot/libsunflower/trunk/sunflower
-include $(shell rospack find mk)/download_unpack_build.mk
+#include $(shell rospack find mk)/download_unpack_build.mk
+include $(shell rospack find mk)/svn_checkout.mk
+installed: $(SVN_DIR) patched
+ cd $(SVN_DIR) && ./bootstrap-buildsystem.sh
+ test -d $(BUILD_DIR) || mkdir -p $(BUILD_DIR)
+ cd $(BUILD_DIR) && $(SVN_DIR)/configure --with-pic \
+ --prefix=$(INST_DIR) \
+ --with-estar=$(ESTAR_DIR) \
+ --with-boost=$(BOOST_DIR)
+ $(MAKE) -C $(BUILD_DIR) install
+ touch installed
+
.PHONY: really-all
really-all: $(SOURCE_DIR)/configure $(BUILD_DIR)/config.h
$(MAKE) -C $(BUILD_DIR) install
@@ -63,10 +75,11 @@
--with-boost=$(BOOST_DIR)
clean:
- $(MAKE) -C $(BUILD_DIR) clean
+ -$(MAKE) -C $(BUILD_DIR) clean
+ rm -f installed
distclean:
$(MAKE) -C $(BUILD_DIR) distclean
-wipe:
- rm -rf $(BUILD_DIR) $(INST_DIR) build
+wipe: clean
+ rm -rf build $(INST_DIR)
Modified: pkg/trunk/3rdparty/opencv_latest/Makefile
===================================================================
--- pkg/trunk/3rdparty/opencv_latest/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/opencv_latest/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,31 +1,28 @@
INSTALL_DIR = opencv
-all: $(INSTALL_DIR)
+all: installed
SVN_DIR = build/opencv-svn
SVN_URL = https://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/tags/latest_tested_snapshot/opencv
+SVN_PATCH = cmake_2.4.6.patch
include $(shell rospack find mk)/svn_checkout.mk
-CMAKE = `rospack find cmake`/cmake/bin/cmake
+CMAKE = cmake
CMAKE_ARGS = -D CMAKE_BUILD_TYPE=RELEASE \
-D CMAKE_INSTALL_PREFIX=$(PWD)/$(INSTALL_DIR) \
-D BUILD_PYTHON_SUPPORT=OFF
-configured: Makefile
- #@if [ ! -d /usr/include/gtk-2.0 ]; then echo "you don't appear to have the GTK+2.0 headers. On Ubuntu, this is fixed with 'sudo apt-get install libgtk2.0-dev'"; false; fi
+installed: $(SVN_DIR) patched
mkdir -p $(SVN_DIR)/build
cd $(SVN_DIR)/build && $(CMAKE) $(CMAKE_ARGS) ..
- touch configured
-
-.PHONY: $(INSTALL_DIR)
-$(INSTALL_DIR): SVN_UP configured
cd $(SVN_DIR)/build && make $(PARALLEL_JOBS) && make install
@echo "patch opencv.pc to pass -Wl,-rpath,-L{libdir}"
-mv $(PWD)/$(INSTALL_DIR)/lib/pkgconfig/opencv.pc $(PWD)/$(INSTALL_DIR)/lib/pkgconfig/opencv.bak
sed 's%Libs: -L$${libdir} -lcxcore%Libs: -Wl,-rpath,$${libdir} -L$${libdir} -lcxcore%g' $(PWD)/$(INSTALL_DIR)/lib/pkgconfig/opencv.bak > $(PWD)/$(INSTALL_DIR)/lib/pkgconfig/opencv.pc
+ touch installed
clean:
-cd $(SVN_DIR)/build && make clean
- rm -rf $(INSTALL_DIR) configured
+ rm -rf $(INSTALL_DIR) installed
wipe: clean
rm -rf build
Added: pkg/trunk/3rdparty/opencv_latest/cmake_2.4.6.patch
===================================================================
--- pkg/trunk/3rdparty/opencv_latest/cmake_2.4.6.patch (rev 0)
+++ pkg/trunk/3rdparty/opencv_latest/cmake_2.4.6.patch 2009-01-13 07:24:01 UTC (rev 9324)
@@ -0,0 +1,13 @@
+--- CMakeLists.txt (revision 1484)
++++ CMakeLists.txt (working copy)
+@@ -170,7 +170,9 @@
+ endforeach()
+
+ foreach(P "${ALIAS_LIBRARY_DIRS}")
+- list(APPEND HIGHGUI_LIBRARY_DIRS ${${P}})
++ if (${${P}})
++ list(APPEND HIGHGUI_LIBRARY_DIRS ${${P}})
++ endif(${${P}})
+ endforeach()
+
+ list(APPEND HIGHGUI_LIBRARIES ${${ALIAS_LIBRARIES}})
Modified: pkg/trunk/3rdparty/opende/Makefile
===================================================================
--- pkg/trunk/3rdparty/opende/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/opende/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -10,7 +10,7 @@
CFG_OPTIONS += --with-drawstuff=X11
endif
-all: build
+all: installed
SVN_DIR = opende-svn
SVN_URL = https://opende.svn.sourceforge.net/svnroot/opende/trunk
@@ -22,15 +22,9 @@
ROOT = $(shell rospack find opende)/opende
-build: SVN_UP_REVERT_PATCH opende
-
-configured: $(SVN_DIR) Makefile
+installed: $(SVN_DIR) patched
cd $(SVN_DIR) && sh ./autogen.sh
cd $(SVN_DIR) && ./configure --prefix=$(ROOT) --with-trimesh=opcode --enable-new-trimesh --enable-shared $(CONFIGURE_FLAGS)
- touch configured
-
-.PHONY: opende
-opende: configured
cd $(SVN_DIR) && make $(PARALLEL_JOBS)
cd $(SVN_DIR) && make install
@echo "patch ode-config to pass -Wl,-rpath,-L{exec_prefix}/lib"
@@ -39,9 +33,10 @@
@echo "patch ode.pc to pass -Wl,-rpath,-L{libdir}"
sed 's/Libs: -L$${libdir} -lode/Libs: -Wl,-rpath,$${libdir} -L$${libdir} -lode/g' opende-svn/ode.pc > opende/lib/pkgconfig/ode.pc
#sed 's/Libs: -L$${libdir} -lode/Libs: -Wl,-rpath,$${libdir} -L$${libdir} -lode -Wl,-rpath,\/opt\/intel\/cc\/10.1.008\/lib -L\/opt\/intel\/cc\/10.1.008\/lib -lguide -lcxaguard -limf -lsvml -lirc -pthread/g' opende-svn/ode.pc > opende/lib/pkgconfig/ode.pc
+ touch installed
clean:
-cd $(SVN_DIR) && make clean
- rm -rf opende configured
+ rm -rf opende installed
wipe: clean
rm -rf $(SVN_DIR)
Modified: pkg/trunk/3rdparty/openrave/Makefile
===================================================================
--- pkg/trunk/3rdparty/openrave/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/openrave/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,4 +1,4 @@
-all: openrave
+all: installed
SVN_DIR = openrave_svn
# Should really specify a revision
@@ -8,13 +8,13 @@
.PHONY: openrave
-build: SVN_UP openrave
+installed: $(SVN_DIR) patched
+ @cd $(SVN_DIR) && export PATH="$(shell rospack find soqt)/bin:$(shell rospack find opende)/opende/bin:$(PATH)" && export CPATH="$(shell rospack find bullet)/include" && export LD_LIBRARY_PATH=$(shell rospack find bullet)/lib:$(LD_LIBRARY_PATH) && export BOOST_ROOT=$(shell rospack find boost)/boost && mkdir -p build && cd build && cmake -DCMAKE_INSTALL_PREFIX=$(PWD) -DCMAKE_BUILD_TYPE=Release .. && make $(PARALLEL_JOBS) install
+ touch installed
-openrave: SVN_UP
- @cd $(SVN_DIR) && export PATH="$(shell rospack find soqt)/bin:$(shell rospack find opende)/opende/bin:$(PATH)" && export CPATH="$(shell rospack find bullet)/include" && export LD_LIBRARY_PATH=$(shell rospack find bullet)/lib:$(LD_LIBRARY_PATH) && export BOOST_ROOT=$(shell rospack find boost)/boost && mkdir -p build && cd build && $(shell rospack find cmake)/cmake/bin/cmake -DCMAKE_INSTALL_PREFIX=$(PWD) -DCMAKE_BUILD_TYPE=Release .. && make $(PARALLEL_JOBS) install
-
clean:
make -C $(SVN_DIR) clean
+ rm -f installed
wipe: clean
rm -rf $(SVN_DIR) include lib share bin
Modified: pkg/trunk/3rdparty/player/Makefile
===================================================================
--- pkg/trunk/3rdparty/player/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/player/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -3,6 +3,7 @@
TARBALL = build/$(VERSION).tar.bz2
TARBALL_URL = http://pr.willowgarage.com/downloads/$(VERSION).tar.bz2
SOURCE_DIR = build/player-svn
+TARBALL_PATCH = cmake-2.4-ros.patch
UNPACK_CMD = tar xf
SVN_DIR = player-svn
@@ -10,12 +11,12 @@
SVN_REVISION = -r 7125
#include $(shell rospack find mk)/svn_checkout.mk
-all: player
+all: installed
include $(shell rospack find mk)/download_unpack_build.mk
-CMAKE = `rospack find cmake`/cmake/bin/cmake
+CMAKE = cmake
CMAKE_ARGS = -D CMAKE_BUILD_TYPE=RELEASE \
-D CMAKE_INSTALL_PREFIX=$(PWD)/player \
-D INCLUDE_RTK=OFF \
@@ -141,18 +142,19 @@
-D ENABLE_DRIVER_XSENSMT=OFF \
-D ENABLE_DRIVER_YARPIMAGE=OFF
-configured: $(SOURCE_DIR) Makefile
+installed: wiped $(SOURCE_DIR)
mkdir -p $(SOURCE_DIR)/build
cd $(SOURCE_DIR)/build && $(CMAKE) $(CMAKE_ARGS) ..
- touch configured
-
-.PHONY: player
-player: configured
cd $(SOURCE_DIR)/build && make $(PARALLEL_JOBS) install
+ touch installed
+wiped: Makefile
+ make wipe
+ touch wiped
+
clean:
rm -rf $(SOURCE_DIR)/build
- rm -rf player configured
+ rm -rf player installed wiped
wipe: clean
rm -rf build
Added: pkg/trunk/3rdparty/player/cmake-2.4-ros.patch
===================================================================
--- pkg/trunk/3rdparty/player/cmake-2.4-ros.patch (rev 0)
+++ pkg/trunk/3rdparty/player/cmake-2.4-ros.patch 2009-01-13 07:24:01 UTC (rev 9324)
@@ -0,0 +1,79 @@
+diff -urN ./cmake/internal/DriverUtils.cmake ../player-svn.new/cmake/internal/DriverUtils.cmake
+--- ./cmake/internal/DriverUtils.cmake 2008-11-18 23:01:32.000000000 -0800
++++ ../player-svn.new/cmake/internal/DriverUtils.cmake 2009-01-08 16:52:14.940210814 -0800
+@@ -159,7 +159,7 @@
+ # _cumulativeVar: The option used in the calling CMakeLists.txt to check if
+ # the driver has been enabled.
+ # _package: Name (and possibly version) of the package to look for.
+-INCLUDE (FindPkgConfig)
++INCLUDE($ENV{ROS_ROOT}/core/rosbuild/FindPkgConfig.cmake)
+ MACRO (PLAYERDRIVER_REQUIRE_PKG _name _cumulativeVar _package _includeDir _libDir _linkFlags _cFlags)
+ IF (NOT PKG_CONFIG_FOUND)
+ MESSAGE (FATAL_ERROR "Could not find pkg-config.")
+diff -urN ./cmake/internal/SearchForStuff.cmake ../player-svn.new/cmake/internal/SearchForStuff.cmake
+--- ./cmake/internal/SearchForStuff.cmake 2008-11-18 23:01:32.000000000 -0800
++++ ../player-svn.new/cmake/internal/SearchForStuff.cmake 2009-01-08 16:52:25.847711292 -0800
+@@ -82,7 +82,7 @@
+ TEST_BIG_ENDIAN (WORDS_BIGENDIAN)
+
+ # GTK checks
+-INCLUDE (FindPkgConfig)
++INCLUDE($ENV{ROS_ROOT}/core/rosbuild/FindPkgConfig.cmake)
+ IF (NOT PKG_CONFIG_FOUND)
+ MESSAGE (STATUS "WARNING: Could not find pkg-config; cannot search for GTK or related.")
+ ELSE (NOT PKG_CONFIG_FOUND)
+diff -urN ./cmake/UsePlayerC.cmake ../player-svn.new/cmake/UsePlayerC.cmake
+--- ./cmake/UsePlayerC.cmake 2008-11-18 23:01:32.000000000 -0800
++++ ../player-svn.new/cmake/UsePlayerC.cmake 2009-01-08 16:51:27.297713167 -0800
+@@ -1,7 +1,7 @@
+ CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR)
+ INCLUDE (PlayerUtils)
+
+-INCLUDE (FindPkgConfig)
++INCLUDE($ENV{ROS_ROOT}/core/rosbuild/FindPkgConfig.cmake)
+ IF (NOT PKG_CONFIG_FOUND)
+ MESSAGE (FATAL_ERROR "Could not find pkg-config.")
+ ELSE (NOT PKG_CONFIG_FOUND)
+diff -urN ./cmake/UsePlayerC++.cmake ../player-svn.new/cmake/UsePlayerC++.cmake
+--- ./cmake/UsePlayerC++.cmake 2008-11-18 23:01:32.000000000 -0800
++++ ../player-svn.new/cmake/UsePlayerC++.cmake 2009-01-08 16:51:39.747978064 -0800
+@@ -1,7 +1,7 @@
+ CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR)
+ INCLUDE (PlayerUtils)
+
+-INCLUDE (FindPkgConfig)
++INCLUDE($ENV{ROS_ROOT}/core/rosbuild/FindPkgConfig.cmake)
+ IF (NOT PKG_CONFIG_FOUND)
+ MESSAGE (FATAL_ERROR "Could not find pkg-config.")
+ ELSE (NOT PKG_CONFIG_FOUND)
+diff -urN ./cmake/UsePlayerPlugin.cmake ../player-svn.new/cmake/UsePlayerPlugin.cmake
+--- ./cmake/UsePlayerPlugin.cmake 2008-11-18 23:01:32.000000000 -0800
++++ ../player-svn.new/cmake/UsePlayerPlugin.cmake 2009-01-08 16:51:52.148960535 -0800
+@@ -1,7 +1,7 @@
+ CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR)
+ INCLUDE (PlayerUtils)
+
+-INCLUDE (FindPkgConfig)
++INCLUDE($ENV{ROS_ROOT}/core/rosbuild/FindPkgConfig.cmake)
+ IF (NOT PKG_CONFIG_FOUND)
+ MESSAGE (FATAL_ERROR "Could not find pkg-config.")
+ ELSE (NOT PKG_CONFIG_FOUND)
+@@ -13,7 +13,7 @@
+ LIST_TO_STRING (PLUGIN_PLAYERC_CFLAGS_STR "${PLUGIN_PLAYERC_CFLAGS}")
+ LIST_TO_STRING (PLUGIN_PLAYERC_LDFLAGS_STR "${PLUGIN_PLAYERC_LDFLAGS}")
+
+-INCLUDE (FindPkgConfig)
++INCLUDE($ENV{ROS_ROOT}/core/rosbuild/FindPkgConfig.cmake)
+ IF (NOT PKG_CONFIG_FOUND)
+ MESSAGE (FATAL_ERROR "Could not find pkg-config.")
+ ELSE (NOT PKG_CONFIG_FOUND)
+diff -urN ./CMakeLists.txt ../player-svn.new/CMakeLists.txt
+--- ./CMakeLists.txt 2008-11-18 23:01:42.000000000 -0800
++++ ../player-svn.new/CMakeLists.txt 2009-01-08 16:49:55.070210399 -0800
+@@ -1,4 +1,5 @@
+-CMAKE_MINIMUM_REQUIRED (VERSION 2.4.7 FATAL_ERROR)
++#CMAKE_MINIMUM_REQUIRED (VERSION 2.4.7 FATAL_ERROR)
++CMAKE_MINIMUM_REQUIRED (VERSION 2.4.7)
+
+ # Compatibility settings
+ IF (COMMAND CMAKE_POLICY)
Modified: pkg/trunk/3rdparty/plplot/Makefile
===================================================================
--- pkg/trunk/3rdparty/plplot/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/plplot/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,27 +1,22 @@
-all: build
+all: installed
SVN_DIR = plplot-svn
SVN_URL = https://plplot.svn.sf.net/svnroot/plplot/trunk
SVN_REVISION = -r 8746
include $(shell rospack find mk)/svn_checkout.mk
-CMAKE = `rospack find cmake`/cmake/bin/cmake
+CMAKE = cmake
CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(PWD)/plplot \
-DPLD_wxwidgets:BOOL=ON
-build: SVN_UP plplot
-
-configured: $(SVN_DIR) Makefile
+installed: $(SVN_DIR) patched
cd $(SVN_DIR) && mkdir -p build
cd $(SVN_DIR)/build && $(CMAKE) $(CMAKE_ARGS) ..
- touch configured
-
-.PHONY: plplot
-plplot: configured
cd $(SVN_DIR)/build && make install
+ touch installed
clean:
rm -rf $(SVN_DIR)/build
- rm -rf plplot configured
+ rm -rf plplot installed
wipe: clean
rm -rf plplot-svn
Modified: pkg/trunk/3rdparty/sicktoolbox/Makefile
===================================================================
--- pkg/trunk/3rdparty/sicktoolbox/Makefile 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/sicktoolbox/Makefile 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,19 +1,26 @@
-all: sicktoolbox
+all: installed
-download:
- wget -nc -nv http://pr.willowgarage.com/downloads/sicktoolbox-1.0.tar.gz
+TARBALL = build/sicktoolbox-1.0.tar.gz
+TARBALL_URL = http://pr.willowgarage.com/downloads/sicktoolbox-1.0.tar.gz
+SOURCE_DIR = build/sicktoolbox-1.0
+#MD5SUM_FILE = sicktoolbox-1.0.tar.gz.md5sum
+UNPACK_CMD = tar xzf
+TARBALL_PATCH = stdlib_include.patch
-sicktoolbox-1.0: download
- #md5sum -c sicktoolbox-1.0.tar.gz.md5sum
- tar xzf sicktoolbox-1.0.tar.gz && patch -p0 <stdlib_include.patch
+include $(shell rospack find mk)/download_unpack_build.mk
-sicktoolbox: sicktoolbox-1.0
- cd sicktoolbox-1.0 && ./configure --prefix=$(PWD)/sicktoolbox
- cd sicktoolbox-1.0 && make && make install
+installed: wiped $(SOURCE_DIR)
+ cd $(SOURCE_DIR) && ./configure --prefix=$(PWD)/sicktoolbox
+ cd $(SOURCE_DIR) && make && make install
+ touch installed
+wiped: Makefile
+ make wipe
+ touch wiped
+
clean:
-rm -rf sicktoolbox-1.0 sicktoolbox
- rm -f *~
+ rm -f *~ installed
.PHONY : clean wipe
Modified: pkg/trunk/3rdparty/sicktoolbox/stdlib_include.patch
===================================================================
--- pkg/trunk/3rdparty/sicktoolbox/stdlib_include.patch 2009-01-13 07:07:00 UTC (rev 9323)
+++ pkg/trunk/3rdparty/sicktoolbox/stdlib_include.patch 2009-01-13 07:24:01 UTC (rev 9324)
@@ -1,5 +1,5 @@
-iff -Naur sicktoolbox-1.0/c++/examples/ld/ld_config/src/main.cc /home/stair/ros/ros-pkg/3rdparty/sicktoolbox/sicktoolbox-1.0/c++/examples/ld/ld_config/src/main.cc
---- sicktoolbox-1.0/c++/examples/ld/ld_config/src/main.cc 2008-03-17 14:39:59.000000000 -0700
+diff -Naur c++/examples/ld/ld_config/src/main.cc /home/stair/ros/ros-pkg/3rdparty/sicktoolbox/sicktoolbox-1.0/c++/examples/ld/ld_config/src/main.cc
+--- c++/examples/ld/ld_config/src/main.cc 2008-03-17 14:39:59.000000000 -0700
+++ /home/stair/ros/ros-pkg/3rdparty/sicktoolbox/sicktoolbox-1.0/c++/examples/ld/ld_config/src/main.cc 2008-11-07 16:56:06.000000000 -0800
@@ -23,6 +23,7 @@
#include <string>
@@ -10,7 +10,7 @@
#include "ConfigFile.h"
diff -Naur sicktoolbox-1.0/c++/examples/ld/ld_more_config/src/main.cc /home/stair/ros/ros-pkg/3rdparty/sicktoolbox/sicktoolbox-1.0/c++/examples/ld/ld_more_config/src/main.cc
---- sicktoolbox-1.0/c++/examples/ld/ld_more_config/src/main.cc 2008-03-17 15:12:20.000000000 -0700
+--- c++/examples/ld/ld_more_config/src/main.cc 2008-03-17 15:12:20.000000000 -0700
+++ /home/stair/ros/ros-pkg/3rdparty/sicktoolbox/sicktoolbox-1.0/c++/examples/ld/ld_more_config/src/main.cc 2008-11-07 16:56:25.000000000 -0800
@@ -16,6 +16,7 @@
* See http://sicktoolbox.sourceforge.net
@@ -21,7 +21,7 @@
#include <iostream>
#include <sickld-1.0/SickLD.hh>
diff -Naur sicktoolbox-1.0/c++/examples/ld/ld_multi_sector/src/main.cc /home/stair/ros/ros-pkg/3rdparty/sicktoolbox/sicktoolbox-1.0/c++/examples/ld/ld_multi_sector/src/main.cc
---- sicktoolbox-1.0/c++/examples/ld/ld_multi_sector/src/main.cc 2008-03-17 15:13:07.000000000 -0700
+--- c++/examples/ld/ld_multi_sector/src/main.cc 2008-03-17 15:13:07.000000000 -0700
+++ /home/stair/ros/ros-pkg/3rdparty/sicktoolbox/sicktoolbox-1.0/c++/examples/ld/ld_multi_sector/src/main.cc 2008-11-07 16:56:40.000000000 -0800
@@ -14,6 +14,7 @@
* See http://sicktoolbox.sourceforge.net
@@ -32,7 +32,7 @@
#include <iostream>
#include <sickld-1.0/SickLD.hh>
diff -Naur sicktoolbox-1.0/c++/examples/ld/ld_single_sector/src/main.cc /home/stair/ros/ros-pkg/3rdparty/sicktoolbox/sicktoolbox-1.0/c++/examples/ld/ld_single_sector/src/main.cc
---- sicktoolbox-1.0/c++/examples/ld/ld_single_sector/src/main.cc 2008-03-17 15:13:51.000000000 -0700
+--- c++/examples/ld/ld_single_sector/src/main.cc 2008-03-17 15:13:51.000000000 -0700
+++ /home/stair/ros/ros-pkg/3rdparty/sicktoolbox/sicktoolbox-1.0/c++/examples/ld/ld_single_sector/src/main.cc 2008-11-07 16:56:59.000000000 -0800
@@ -14,6 +14,7 @@
* See http://sicktoolbox.sourceforge.net
@@ -43,7 +43,7 @@
#include <iostream>
#include <sickld-1.0/SickLD.hh>
diff -Naur sicktoolbox-1.0/c++/examples/lms/lms_config/src/main.cc /home/stair/ros/ros-pkg/3rdparty/sicktoolbox/sicktoolbox-1.0/c++/examples/lms/lms_config/src/main.cc
---- sicktoolbox-1.0/c++/examples/lms/lms_config/src/main.cc 2008-03-17 15:14:53.000000000 -0700
+--- c++/examples/lms/lms_config/src/main.cc 2008-03-17 15:14:53.000000000 -0700
+++ /home/stair/ros/ros-pkg/3rdparty/sicktoolbox/sicktoolbox-1.0/c++/examples/lms/lms...
[truncated message content] |
