Merge pull request #3 from Ant13731/transferringWebsite2

transferring Makefile commands for website

code/Makefile

@@ -254,6 +254,19 @@ deploy_lite:
 	@BUILD_FOLDER="$(BUILD_FOLDER)" DEPLOY_FOLDER="$(DEPLOY_FOLDER)" GRAPH_FOLDER="$(GRAPH_FOLDER)" \
 	EXAMPLE_DIRS="$(EXAMPLE_DIRS)" MULTI_SRC_DIRS="$(MULTI_SRC_DIRS)" ANALYSIS_FOLDER="$(ANALYSIS_FOLDER)" \
 	DEPLOY_CODE_PATH_KV_SEP="$(DEPLOY_CODE_PATH_KV_SEP)" MAKE="$(MAKE)" "$(SHELL)" "$(SCRIPT_FOLDER)"deploy_stage.sh
+
+website:
+	stack install drasil-website
+	cd "drasil-website" && \
+	CUR_DIR="$(PWD)/" \
+	DEPLOY_FOLDER="$(CUR_DIR)$(DEPLOY_FOLDER)"  \
+	DOCS_FOLDER="$(DOCS_FOLDER)" \
+	DOX_FOLDER="doxygen/" \
+	EXAMPLES_FOLDER="examples/" \
+	SRS_FOLDER_FRAG="srs/" \
+	GRAPH_FOLDER="$(GRAPH_FOLDER)" \
+	ANALYSIS_FOLDER="$(ANALYSIS_FOLDER)" \
+	stack exec website
 # This rule is for use with developing deployment layout locally. As part of it, it ensures all needed
 # dependencies exist. One of the downsides is we ensure all files are re-generated which means the TeX
 # files appear newer and thus PDF's are regenerated. If you want to "just generate the structure,
@@ -273,4 +286,4 @@ clean_artifacts cleanArtifacts: $(CLEAN_FOLDERS)
 clean: clean_artifacts
 	- stack clean
 
-.PHONY: clean clean_artifacts cleanArtifacts code hlint hot_hlint analysis tex doc debug prog test graphs graphmod check_stack graphs deploy_code_path deploy deploy_lite all $(GOOLTEST) $(ALL_EXPANDED_TARGETS)
+.PHONY: clean clean_artifacts cleanArtifacts code hlint hot_hlint analysis tex doc debug prog test graphs graphmod check_stack graphs website deploy_code_path deploy deploy_lite all $(GOOLTEST) $(ALL_EXPANDED_TARGETS)

code/drasil-website/drasil-website.cabal

@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 0d7324cdec0fd58fcd2b6aff4990af0e7a64e2f226db2be4bd722c35b32973fe
+-- hash: b5d32202f308c3d7fbaa9a9e2f1d930b665d1fce6bd45dec4fa0537538132612
 
 name:           drasil-website
 version:        0.1.0.0
@@ -13,8 +13,6 @@ description:    Please see the README on GitHub at <https://github.com/JacquesCa
 homepage:       https://jacquescarette.github.io/Drasil/
 bug-reports:    https://github.com/JacquesCarette/Drasil/issues
 maintainer:     Jacques Carette
-license:        BSD3
-license-file:   LICENSE
 build-type:     Simple
 
 source-repository head

code/scripts/deploy_stage.sh

@@ -131,9 +131,7 @@ copy_analysis() {
 }
 
 build_website() {
-  cd "$CUR_DIR/"drasil-website
-  make DEPLOY_FOLDER="$CUR_DIR$DEPLOY_FOLDER" DOCS_FOLDER="$DOC_DEST" DOX_FOLDER="$DOX_DEST" EXAMPLES_FOLDER="$EXAMPLE_DEST" \
-  SRS_FOLDER_FRAG="$SRS_DEST" GRAPH_FOLDER="$GRAPH_FOLDER"
+  cd "$CUR_DIR/"drasil-website 
   RET=$?
   if [ $RET != 0 ]; then
     echo "Build Failed. Bailing."