Unverified Commit 833b238e authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

Move scripts folder to top directory

parent cbc598b4

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ compile dependencies: 
  script:

   # Folder of built dependencies is cached and marked with the ID of the commit from which have been built.

   # If the download and compile script have been modified the cache gets invalidated and dependencies will be built again.

   - ( [ -f "${DEPS_COMMIT}" ] && git diff --quiet "`cat ${DEPS_COMMIT}`" -- ifs/scripts/dl_dep.sh ifs/scripts/compile_dep.sh ) || (

   - ( [ -f "${DEPS_COMMIT}" ] && git diff --quiet "`cat ${DEPS_COMMIT}`" -- scripts/dl_dep.sh scripts/compile_dep.sh ) || (

           rm -f ${DEPS_COMMIT} &&

           ifs/scripts/dl_dep.sh ${DEPS_SRC_PATH} -n ofi &&

           ifs/scripts/compile_dep.sh -n ofi ${DEPS_SRC_PATH} ${DEPS_INSTALL_PATH} &&

           scripts/dl_dep.sh ${DEPS_SRC_PATH} -n ofi &&

           scripts/compile_dep.sh -n ofi ${DEPS_SRC_PATH} ${DEPS_INSTALL_PATH} &&

           echo "${CI_COMMIT_SHA}" > "${DEPS_COMMIT}"

     )

  artifacts:

README.md

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ This is a file system. 


## Clone and compile direct ADA-FS dependencies



- Go to the subfolder `ifs/scripts` and first clone all dependencies projects. You can choose the according na_plugin

- Go to the `scripts` folder and first clone all dependencies projects. You can choose the according na_plugin

(execute the script for help):



```bash
@@ -119,7 +119,7 @@ Shut it down by gracefully killing the process. 
 

### Startup and shutdown scripts



The scripts are located in `ifs/scripts/{startup_adafs.py, shutdown_adafs.py}`. Use the -h argument for their usage.

The scripts are located in `scripts/{startup_adafs.py, shutdown_adafs.py}`. Use the -h argument for their usage.



## Miscellaneous

docker/build_env.docker

+3 −3
Original line number Diff line number Diff line
@@ -46,12 +46,12 @@ ENV CC "/opt/rh/devtoolset-7/root/usr/bin/gcc" 
ENV	CXX		"/opt/rh/devtoolset-7/root/usr/bin/g++"



# Download dependencies source

COPY ifs/scripts/dl_dep.sh		$SCRIPTS_PATH/

COPY scripts/dl_dep.sh		$SCRIPTS_PATH/

RUN /bin/bash $SCRIPTS_PATH/dl_dep.sh $DEPS_SRC_PATH all



# Compile dependencies

COPY ifs/scripts/compile_dep.sh $SCRIPTS_PATH/

COPY ifs/scripts/patches		$SCRIPTS_PATH/patches

COPY scripts/compile_dep.sh $SCRIPTS_PATH/

COPY scripts/patches        $SCRIPTS_PATH/patches

RUN /bin/bash $SCRIPTS_PATH/compile_dep.sh $DEPS_SRC_PATH $INSTALL_PATH

ifs/scripts/compile_dep.sh→scripts/compile_dep.sh

+0 −0

File moved.

View file