Merge pull request #184 from imzhenyu/imzhenyu

enable cross platform config.onecluster.ini
microsoft · Oct 11, 2016 · 1b57d9d · 1b57d9d
2 parents 9926a1c + 70bc7f0
commit 1b57d9d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,6 +36,8 @@ endif()
 
 dsn_add_pseudo_projects()
 
+configure_file("bin/config.onecluster.ini.template" "${CMAKE_CURRENT_SOURCE_DIR}/bin/config.onecluster.ini")
+
 include(${GIT_SOURCE_FILE})
 add_subdirectory(ext/thrift)
 add_subdirectory(ext/gtest)
@@ -47,7 +49,6 @@ add_subdirectory(ext/protobuf)
 
 add_subdirectory(src)
 
-configure_file("bin/config.onecluster.ini.template" "bin/config.onecluster.ini")
 
 
 

diff --git a/README.md b/README.md
@@ -9,11 +9,9 @@
 
 ### Top Links
  * [[Case](https://github.com/imzhenyu/rocksdb)] RocksDB made replicated using rDSN!
- * [[Tutorial](https://github.com/Microsoft/rDSN/wiki/Tutorial:-one-box-cluster)] A cluster demo to understand how rDSN helps service registration, deployment, monitoring etc..
+ * [[Tutorial](https://github.com/Microsoft/rDSN/wiki/Tutorial:-one-box-cluster)] A one-box cluster demo to understand how rDSN helps service registration, deployment, monitoring etc..
  * [[Tutorial](https://github.com/Microsoft/rDSN/wiki/Tutorial:-Build-A-Single-Node-Counter-Service)] Build a counter service with built-in tools (e.g., codegen, auto-test, fault injection, bug replay, tracing)
  * [[Tutorial](https://github.com/Microsoft/rDSN/wiki/Tutorial:-Build-A-Scalable-and-Reliable-Counter-Service)] Build a scalable and reliable counter service with built-in replication support
- * [[Tutorial](https://github.com/Microsoft/rDSN/wiki/Tutorial:-Perfect-Failure-Detector)] Build a perfect failure detector with progressively added system complexity
- * [[Tutorial](https://github.com/Microsoft/rDSN/wiki/Tutorial:-Plugin-A-New-Network-Implementation)] Plugin my own network implementation for higher performance
  * [API Reference](http://imzhenyu.github.io/rDSN/documents/v1/html/index.html)
  * [Installation](https://github.com/Microsoft/rDSN/wiki/Installation)
 

diff --git a/bin/config.onecluster.ini.template b/bin/config.onecluster.ini.template
@@ -1,7 +1,7 @@
 [config.args]
 meta_port = 24601
 daemon_port = 24801
-package_dir = C:\work\rDSN\src\tools\webstudio\app_package\local\packages
+package_dir = ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/webstudio/app_package/local/packages
 
 [modules]
 dsn.tools.common