Permalink
Browse files

Fixed the SOURCES_DIRECTORY bug on several parts on the Alice codebase.

  • Loading branch information...
1 parent 0041ee0 commit a6a979fbdcc089857acbd54ef40694e32b8513f0 @mr-rock mr-rock committed Feb 14, 2012
Showing with 9 additions and 9 deletions.
  1. +2 −2 .alice/templates
  2. +7 −7 Makefile
View
@@ -87,10 +87,10 @@ TESTMODULE_JS += "\n\n\tdescribe('\#example', function(){\
ifeq "$(GROUP)" ""
TESTMODULE_CS = "describe '$(NAME)', ->\
-\n\t$(NAME_CAMELIZED) = require '../../$(SOURCE_DIRECTORY)/$(LIBRARIES_DIRECTORY)/$(NAME_CAMELIZED)'"
+\n\t$(NAME_CAMELIZED) = require '../../$(SOURCES_DIRECTORY)/$(LIBRARIES_DIRECTORY)/$(NAME_CAMELIZED)'"
else
TESTMODULE_CS = "describe '$(GROUP) > $(NAME)', ->\
-\n\t$(NAME_CAMELIZED) = require '../../../$(SOURCE_DIRECTORY)/$(LIBRARIES_DIRECTORY)/$(GROUP_CAMELIZED)/$(NAME_CAMELIZED)'"
+\n\t$(NAME_CAMELIZED) = require '../../../$(SOURCES_DIRECTORY)/$(LIBRARIES_DIRECTORY)/$(GROUP_CAMELIZED)/$(NAME_CAMELIZED)'"
endif
TESTMODULE_CS += "\n\n\tdescribe '\#example', ->\
View
@@ -77,8 +77,8 @@ else
ifeq "$(GROUP)" ""
ifeq "$(LIB_LANGUAGE)" "CS"
module:
- @mkdir -p ./$(SOURCE_DIRECTORY)/$(LIBRARIES_DIRECTORY)
- @echo $(MODULE_CS) > ./$(SOURCE_DIRECTORY)/$(LIBRARIES_DIRECTORY)/$(NAME_CAMELIZED).coffee
+ @mkdir -p ./$(SOURCES_DIRECTORY)/$(LIBRARIES_DIRECTORY)
+ @echo $(MODULE_CS) > ./$(SOURCES_DIRECTORY)/$(LIBRARIES_DIRECTORY)/$(NAME_CAMELIZED).coffee
@mkdir -p ./$(TESTS_DIRECTORY)/$(LIBRARIES_DIRECTORY)
@echo $(TESTMODULE_CS) > ./$(TESTS_DIRECTORY)/$(LIBRARIES_DIRECTORY)/$(NAME_CAMELIZED)-test.coffee
else
@@ -91,8 +91,8 @@ endif
else
ifeq "$(LIB_LANGUAGE)" "CS"
module:
- @mkdir -p ./$(SOURCE_DIRECTORY)/$(LIBRARIES_DIRECTORY)/$(GROUP_CAMELIZED);
- @echo $(MODULE_CS) > ./$(SOURCE_DIRECTORY)/$(LIBRARIES_DIRECTORY)/$(GROUP_CAMELIZED)/$(NAME_CAMELIZED).coffee;
+ @mkdir -p ./$(SOURCES_DIRECTORY)/$(LIBRARIES_DIRECTORY)/$(GROUP_CAMELIZED);
+ @echo $(MODULE_CS) > ./$(SOURCES_DIRECTORY)/$(LIBRARIES_DIRECTORY)/$(GROUP_CAMELIZED)/$(NAME_CAMELIZED).coffee;
@mkdir -p ./$(TESTS_DIRECTORY)/$(LIBRARIES_DIRECTORY)/$(GROUP_CAMELIZED);
@echo $(TESTMODULE_CS) > ./$(TESTS_DIRECTORY)/$(LIBRARIES_DIRECTORY)/$(GROUP_CAMELIZED)/$(NAME_CAMELIZED)-test.coffee;
else
@@ -108,13 +108,13 @@ endif
ifeq "$(LIB_LANGUAGE)" "CS"
build:
@$(COFFEE) --compile --output . $(SOURCE_DIRECTORY)
- @if [ -d "$(SOURCE_DIRECTORY)/$(EXECUTABLES_DIRECTORY)" ]; then $(COFFEE) --compile --output $(EXECUTABLES_DIRECTORY) $(SOURCE_DIRECTORY)/$(EXECUTABLES_DIRECTORY); fi
- @if [ -d "$(SOURCE_DIRECTORY)/$(LIBRARIES_DIRECTORY)" ]; then $(COFFEE) --compile --output $(LIBRARIES_DIRECTORY) $(SOURCE_DIRECTORY)/$(LIBRARIES_DIRECTORY); fi
+ @if [ -d "$(SOURCES_DIRECTORY)/$(EXECUTABLES_DIRECTORY)" ]; then $(COFFEE) --compile --output $(EXECUTABLES_DIRECTORY) $(SOURCES_DIRECTORY)/$(EXECUTABLES_DIRECTORY); fi
+ @if [ -d "$(SOURCES_DIRECTORY)/$(LIBRARIES_DIRECTORY)" ]; then $(COFFEE) --compile --output $(LIBRARIES_DIRECTORY) $(SOURCES_DIRECTORY)/$(LIBRARIES_DIRECTORY); fi
endif
ifeq "$(LIB_LANGUAGE)" "CS"
watch:
- $(JITTER) $(SOURCE_DIRECTORY) . $(TEST_DIRECTORY)
+ $(JITTER) $(SOURCES_DIRECTORY) . $(TEST_DIRECTORY)
endif
ifeq "$(LIB_LANGUAGE)" "CS"

0 comments on commit a6a979f

Please sign in to comment.