Skip to content

Commit

Permalink
reset makefile to not have commented out code
Browse files Browse the repository at this point in the history
  • Loading branch information
@niazim3
niazim3 committed Jul 18, 2018
1 parent 7a29b59 commit 581b48a
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions code/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ SWHS_PREF = SWHS_
NoPCM_PREF = NoPCM_
TINY_PREF = Tiny_
SSP_PREF = SSP_
#GLASS_PREF = GlassBR_
GLASS_PREF = GlassBR_
GAME_PREF = Chipmunk_

SWHS_DIR = SWHS
NoPCM_DIR = NoPCM
TINY_DIR = Tiny
SSP_DIR = SSP
#GLASS_DIR = GlassBR
GLASS_DIR = GlassBR
GAME_DIR = Chipmunk

LANG_DIR = drasil-lang
Expand All @@ -24,13 +24,13 @@ TINY_EXE = tiny
SWHS_EXE = swhs
NoPCM_EXE = nopcm
SSP_EXE = ssp
#GLASS_EXE= glassbr
GLASS_EXE= glassbr

DIRS = $(SWHS_DIR) $(NoPCM_DIR) $(TINY_DIR) $(SSP_DIR) $(GAME_DIR) $(DATA_DIR) $(LANG_DIR) $(DOCL_DIR) $(EXAM_DIR) $(CODE_DIR) $(GEN_DIR)
DIRS = $(SWHS_DIR) $(NoPCM_DIR) $(TINY_DIR) $(SSP_DIR) $(GLASS_DIR) $(GAME_DIR) $(DATA_DIR) $(LANG_DIR) $(DOCL_DIR) $(EXAM_DIR) $(CODE_DIR) $(GEN_DIR)
DIFF = diff --strip-trailing-cr --ignore-all-space

TESTS = swhs_diff tiny_diff ssp_diff gamephys_diff nopcm_diff
PROGS = swhs_prog tiny_prog ssp_prog gamephys_prog nopcm_prog
TESTS = swhs_diff tiny_diff ssp_diff glassbr_diff gamephys_diff nopcm_diff
PROGS = swhs_prog tiny_prog ssp_prog glassbr_prog gamephys_prog nopcm_prog

all: build build_code build_data test

Expand Down Expand Up @@ -86,9 +86,9 @@ ssp_build: build_exam
mkdir -p build/$(SSP_DIR)
cd build/$(SSP_DIR) && stack exec $(SSP_EXE)

#glassbr_build: build_exam
#mkdir -p build/$(GLASS_DIR)
#cd build/$(GLASS_DIR) && stack exec $(GLASS_EXE)
glassbr_build: build_exam
mkdir -p build/$(GLASS_DIR)
cd build/$(GLASS_DIR) && stack exec $(GLASS_EXE)

gamephys_build: build_exam
mkdir -p build/$(GAME_DIR)
Expand All @@ -113,10 +113,10 @@ ssp_diff: ssp_build
- $(DIFF) ./stable/ssp/Website/$(SSP_PREF)SRS.css ./build/$(SSP_DIR)/Website/$(SSP_PREF)SRS.css >> $(SSP_PREF)log.log 2>&1
- $(DIFF) ./stable/ssp/Website/$(SSP_PREF)SRS.html ./build/$(SSP_DIR)/Website/$(SSP_PREF)SRS.html >> $(SSP_PREF)log.log 2>&1

#glassbr_diff: glassbr_build
# - $(DIFF) ./stable/glassbr/SRS/$(GLASS_PREF)SRS.tex ./build/$(GLASS_DIR)/SRS/$(GLASS_PREF)SRS.tex > $(GLASS_PREF)log.log 2>&1
# - $(DIFF) ./stable/glassbr/Website/$(GLASS_PREF)SRS.css ./build/$(GLASS_DIR)/Website/$(GLASS_PREF)SRS.css >> $(GLASS_PREF)log.log 2>&1
# - $(DIFF) ./stable/glassbr/Website/$(GLASS_PREF)SRS.html ./build/$(GLASS_DIR)/Website/$(GLASS_PREF)SRS.html >> $(GLASS_PREF)log.log 2>&1
glassbr_diff: glassbr_build
- $(DIFF) ./stable/glassbr/SRS/$(GLASS_PREF)SRS.tex ./build/$(GLASS_DIR)/SRS/$(GLASS_PREF)SRS.tex > $(GLASS_PREF)log.log 2>&1
- $(DIFF) ./stable/glassbr/Website/$(GLASS_PREF)SRS.css ./build/$(GLASS_DIR)/Website/$(GLASS_PREF)SRS.css >> $(GLASS_PREF)log.log 2>&1
- $(DIFF) ./stable/glassbr/Website/$(GLASS_PREF)SRS.html ./build/$(GLASS_DIR)/Website/$(GLASS_PREF)SRS.html >> $(GLASS_PREF)log.log 2>&1

gamephys_diff: gamephys_build
- $(DIFF) ./stable/gamephys/SRS/$(GAME_PREF)SRS.tex ./build/$(GAME_DIR)/SRS/$(GAME_PREF)SRS.tex > $(GAME_PREF)log.log 2>&1
Expand All @@ -134,11 +134,11 @@ tiny_prog: tiny_build

ssp_prog: ssp_build

#glassbr_prog: glassbr_build
# test -d ./build/$(GLASS_DIR)/src/python && cp ./datafiles/$(GLASS_DIR)/*.txt ./build/$(GLASS_DIR)/src/python/
# test -d ./build/$(GLASS_DIR)/src/java && cp ./datafiles/$(GLASS_DIR)/*.txt ./build/$(GLASS_DIR)/src/java/
# test -d ./build/$(GLASS_DIR)/src/csharp && cp ./datafiles/$(GLASS_DIR)/*.txt ./build/$(GLASS_DIR)/src/csharp/
# test -d ./build/$(GLASS_DIR)/src/cpp && cp ./datafiles/$(GLASS_DIR)/*.txt ./build/$(GLASS_DIR)/src/cpp/
glassbr_prog: glassbr_build
test -d ./build/$(GLASS_DIR)/src/python && cp ./datafiles/$(GLASS_DIR)/*.txt ./build/$(GLASS_DIR)/src/python/
test -d ./build/$(GLASS_DIR)/src/java && cp ./datafiles/$(GLASS_DIR)/*.txt ./build/$(GLASS_DIR)/src/java/
test -d ./build/$(GLASS_DIR)/src/csharp && cp ./datafiles/$(GLASS_DIR)/*.txt ./build/$(GLASS_DIR)/src/csharp/
test -d ./build/$(GLASS_DIR)/src/cpp && cp ./datafiles/$(GLASS_DIR)/*.txt ./build/$(GLASS_DIR)/src/cpp/

gamephys_prog: gamephys_build

Expand Down

2 comments on commit 581b48a

@JacquesCarette
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see, it was a temporary thing from some reason that is no longer relevant!

@niazim3
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reasoning behind commenting out GlassBR is actually related to issue #891; in order to get to the discrepancy logs, GlassBR cannot be built at the moment. This change was supposed to be just on my machine, but upon using the -a flag in the when committing, the change propagated to the repo as well so it had to be reverted since looking at the error is a high priority.

Please sign in to comment.