diff options
| author | Daniil Fedotov <hairyhum@gmail.com> | 2016-02-01 23:25:51 +0000 |
|---|---|---|
| committer | Daniil Fedotov <hairyhum@gmail.com> | 2016-02-01 23:25:51 +0000 |
| commit | d3b96aa976b11092c695353e623ec58fe109f4c0 (patch) | |
| tree | c598183cbdbffb5c04d8178b3c3b45ce9d9f0fb9 | |
| parent | 564e11b450b27e650d84a6abb3b0d843adcbe639 (diff) | |
| download | rabbitmq-server-git-d3b96aa976b11092c695353e623ec58fe109f4c0.tar.gz | |
Cuttlefish generation in windows
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 9 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 11 |
3 files changed, 24 insertions, 13 deletions
@@ -338,7 +338,9 @@ SCRIPTS = rabbitmq-defaults \ rabbitmq-env \ rabbitmq-server \ rabbitmqctl \ - rabbitmq-plugins + rabbitmq-plugins \ + cuttlefish \ + rabbitmq.schema WINDOWS_SCRIPTS = rabbitmq-defaults.bat \ rabbitmq-echopid.bat \ @@ -346,7 +348,9 @@ WINDOWS_SCRIPTS = rabbitmq-defaults.bat \ rabbitmq-plugins.bat \ rabbitmq-server.bat \ rabbitmq-service.bat \ - rabbitmqctl.bat + rabbitmqctl.bat \ + cuttlefish \ + rabbitmq.schema UNIX_TO_DOS ?= todos @@ -366,7 +370,7 @@ install-erlapp: dist @# rabbitmq_server/include. $(verbose) cp -r $(DEPS_DIR)/rabbit_common/include $(DESTDIR)$(RMQ_ERLAPP_DIR) -install-scripts: +install-scripts: schema $(verbose) mkdir -p $(DESTDIR)$(RMQ_ERLAPP_DIR)/sbin $(inst_verbose) for script in $(SCRIPTS); do \ cp "scripts/$$script" "$(DESTDIR)$(RMQ_ERLAPP_DIR)/sbin"; \ @@ -408,7 +412,12 @@ install-windows-erlapp: dist # rabbitmq_server/include. $(verbose) cp -r $(DEPS_DIR)/rabbit_common/include $(DESTDIR)$(WINDOWS_PREFIX) -install-windows-scripts: +schema: + $(verbose) rm scripts/rabbitmq.schema + $(verbose) cat schema/*.schema > scripts/rabbitmq.schema + $(verbose) cp cuttlefish scripts/cuttlefish + +install-windows-scripts: schema $(verbose) mkdir -p $(DESTDIR)$(WINDOWS_PREFIX)/sbin $(inst_verbose) for script in $(WINDOWS_SCRIPTS); do \ cp "scripts/$$script" "$(DESTDIR)$(WINDOWS_PREFIX)/sbin"; \ diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 3fc99becf7..26145d5394 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -45,10 +45,11 @@ if exist "!RABBITMQ_CONFIG_FILE!.config" ( set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_CONFIG_FILE!"
) else (
if exist "!RABBITMQ_CONFIG_FILE!.conf" (
- del "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
- "!ERLANG_HOME!\bin\escipt.exe" cuttlefish -e "!RABBITMQ_GENERATED_CONFIG_DIR!" -s schema -c "!RABBITMQ_CONFIG_FILE!.conf" -f rabbitmq
- ren "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.*.config" "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
- set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
+ del "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.config"
+ del "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.*.config"
+ "!ERLANG_HOME!\bin\escript.exe" .\cuttlefish -e "!RABBITMQ_GENERATED_CONFIG_DIR!" -i .\rabbitmq.schema -c "!RABBITMQ_CONFIG_FILE!.conf" -f rabbitmq
+ ren "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.*.config" "rabbitmq.config"
+ set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.config"
)
)
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 147f9f4d84..2e0b78fc03 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -116,11 +116,12 @@ set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin if exist "!RABBITMQ_CONFIG_FILE!.config" (
set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_CONFIG_FILE!"
) else (
- if exist "!RABBITMQ_CONFIG_FILE!.conf" (
- del "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
- "!ERLANG_HOME!\bin\escipt.exe" cuttlefish -e "!RABBITMQ_GENERATED_CONFIG_DIR!" -s schema -c "!RABBITMQ_CONFIG_FILE!.conf" -f rabbitmq
- ren "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.*.config" "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
- set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
+if exist "!RABBITMQ_CONFIG_FILE!.conf" (
+ del "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.config"
+ del "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.*.config"
+ "!ERLANG_HOME!\bin\escript.exe" .\cuttlefish -e "!RABBITMQ_GENERATED_CONFIG_DIR!" -i .\rabbitmq.schema -c "!RABBITMQ_CONFIG_FILE!.conf" -f rabbitmq
+ ren "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.*.config" "rabbitmq.config"
+ set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.config"
)
)
|