Merge pull request #94 from NREL/style_cleanup

code cleanup & EditorConfig

.gitlab-ci.yml

@@ -1,114 +1,114 @@
 stages:
-- build
-- deploy
+    - build
+    - deploy
 
 build:windows:
-  stage: build
-  only:
-  - develop
-  - master
-  tags:
-  - windows
-  before_script:
-  - set PATH=%PATH%;C:\GitLab-Runner\builds\f56554cd\0\NREL\wex\build_vs2013\libcurl_ssl_win32\include\
-  script:
-  - git clone https://github.com/NREL/lk.git
-  # may want to pull a specific SHA here
-  - mkdir build
-  - cd build
-  - cmake -G "Visual Studio 12 2013 Win64" -DLK_DIR="../lk/" -DCURL_DIR="../build_vs2013/libcurl_ssl_win32/include/" -DCMAKE_BUILD_TYPE=Release ../
-  - cmake --build . --config Release --target ALL_BUILD
-  artifacts:
-    expire_in: 1 hrs
-    paths:
-    - build/Release/DView.exe
+    stage: build
+    only:
+        - develop
+        - master
+    tags:
+        - windows
+    before_script:
+        - set PATH=%PATH%;C:\GitLab-Runner\builds\f56554cd\0\NREL\wex\build_vs2013\libcurl_ssl_win32\include\
+    script:
+        - git clone https://github.com/NREL/lk.git
+        # may want to pull a specific SHA here
+        - mkdir build
+        - cd build
+        - cmake -G "Visual Studio 12 2013 Win64" -DLK_DIR="../lk/" -DCURL_DIR="../build_vs2013/libcurl_ssl_win32/include/" -DCMAKE_BUILD_TYPE=Release ../
+        - cmake --build . --config Release --target ALL_BUILD
+    artifacts:
+        expire_in: 1 hrs
+        paths:
+            - build/Release/DView.exe
 
 build:mac:
-  stage: build
-  only:
-  - develop
-  - master
-  tags:
-  - mac
-  script:
-  - git clone https://github.com/NREL/lk.git
-  # may want to pull a specific SHA here
-  - mkdir build
-  - cd build
-  - cmake -DLK_DIR="../lk/" -DCMAKE_BUILD_TYPE=Release ../
-  - make
-  artifacts:
-    expire_in: 1 hrs
-    paths:
-    - build/DView.app
+    stage: build
+    only:
+        - develop
+        - master
+    tags:
+        - mac
+    script:
+        - git clone https://github.com/NREL/lk.git
+        # may want to pull a specific SHA here
+        - mkdir build
+        - cd build
+        - cmake -DLK_DIR="../lk/" -DCMAKE_BUILD_TYPE=Release ../
+        - make
+    artifacts:
+        expire_in: 1 hrs
+        paths:
+            - build/DView.app
 
 build:ubuntu:
-  stage: build
-  only:
-  - develop
-  - master
-  tags:
-  - ubuntu
-  script:
-  - git clone https://github.com/NREL/lk.git
-  # may want to pull a specific SHA here
-  - mkdir build
-  - cd build
-  - cmake -DLK_DIR="../lk/" -DCMAKE_BUILD_TYPE=Release ../
-  - make
-  artifacts:
-    expire_in: 1 hrs
-    paths:
-    - build/DView
+    stage: build
+    only:
+        - develop
+        - master
+    tags:
+        - ubuntu
+    script:
+        - git clone https://github.com/NREL/lk.git
+        # may want to pull a specific SHA here
+        - mkdir build
+        - cd build
+        - cmake -DLK_DIR="../lk/" -DCMAKE_BUILD_TYPE=Release ../
+        - make
+    artifacts:
+        expire_in: 1 hrs
+        paths:
+            - build/DView
 
 deploy:windows:
-  stage: deploy
-  only:
-  - develop
-  - master
-  tags:
-  - windows
-  dependencies:
-  - build:windows
-  script:
-  - cd build/Release
-  - mkdir DView-install
-  - mv DView.exe DView-install
-  - 7z a -tzip DView-windows.zip DView-install
-  - dir
-  - aws s3 cp ./ s3://openstudio-builds/_CI/DView --recursive --exclude "*" --include "DView-windows.zip"
+    stage: deploy
+    only:
+        - develop
+        - master
+    tags:
+        - windows
+    dependencies:
+        - build:windows
+    script:
+        - cd build/Release
+        - mkdir DView-install
+        - mv DView.exe DView-install
+        - 7z a -tzip DView-windows.zip DView-install
+        - dir
+        - aws s3 cp ./ s3://openstudio-builds/_CI/DView --recursive --exclude "*" --include "DView-windows.zip"
 
 deploy:mac:
-  stage: deploy
-  only:
-  - develop
-  - master
-  tags:
-  - mac
-  dependencies:
-  - build:mac
-  script:
-  - cd build
-  - mkdir DView-install
-  - mv DView.app DView-install
-  - tar -zcvf DView-osx.tar.gz DView-install
-  - ls
-  - aws s3 cp ./ s3://openstudio-builds/_CI/DView --recursive --exclude "*" --include "DView-osx.tar.gz"
+    stage: deploy
+    only:
+        - develop
+        - master
+    tags:
+        - mac
+    dependencies:
+        - build:mac
+    script:
+        - cd build
+        - mkdir DView-install
+        - mv DView.app DView-install
+        - tar -zcvf DView-osx.tar.gz DView-install
+        - ls
+        - aws s3 cp ./ s3://openstudio-builds/_CI/DView --recursive --exclude "*" --include "DView-osx.tar.gz"
 
 deploy:ubuntu:
-  stage: deploy
-  only:
-  - develop
-  - master
-  tags:
-  - ubuntu
-  dependencies:
-  - build:ubuntu
-  script:
-  - cd build
-  - mkdir DView-install
-  - mv DView DView-install
-  - tar -zcvf DView-linux.tar.gz DView-install
-  - ls
-  - aws s3 cp ./ s3://openstudio-builds/_CI/DView --recursive --exclude "*" --include "DView-linux.tar.gz"  
+    stage: deploy
+    only:
+        - develop
+        - master
+    tags:
+        - ubuntu
+    dependencies:
+        - build:ubuntu
+    script:
+        - cd build
+        - mkdir DView-install
+        - mv DView DView-install
+        - tar -zcvf DView-linux.tar.gz DView-install
+        - ls
+        - aws s3 cp ./ s3://openstudio-builds/_CI/DView --recursive --exclude "*" --include "DView-linux.tar.gz"
 

.travis.yml

@@ -4,36 +4,35 @@ sudo: required
 language: c++
 
 os:
-  - linux
-  - osx
+    - linux
+    - osx
 
 compiler:
-  - gcc
+    - gcc
 
 before_script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update && sudo apt-get install libglu1-mesa-dev freeglut3-dev mesa-common-dev libgtk2.0-dev; fi
-  - wget -q https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.tar.bz2
-  - tar jxf wxWidgets-3.1.1.tar.bz2
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then (cd wxWidgets-3.1.1 && ./configure --prefix=$HOME/wx-3.1.1 --enable-shared=no --enable-stl=yes --enable-debug=no --with-gtk=2 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin --without-libjbig --without-liblzma --without-gtkprint --with-libnotify=no --with-libmspack=no --with-gnomevfs=no --with-opengl=yes --with-sdl=no --with-cxx=11 && make -j2 all install); fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then (cd wxWidgets-3.1.1 && ./configure --prefix=$HOME/wx-3.1.1 --enable-stl=yes --enable-debug=no --enable-shared=no --with-cocoa --enable-macosx_arch=x86_64 --enable-unicode --enable-webview --with-cxx=11 --with-macosx-version-min=10.9  --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin --disable-mediactrl   && make -j2 all install); fi
-  - sudo ln -s $HOME/wx-3.1.1/bin/wx-config /usr/local/bin/wx-config-3
-  - user=$(echo $TRAVIS_REPO_SLUG | sed 's,/.*$,,')
-  - cd ../
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export LKDIR=/home/travis/build/$user/lk; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export LKDIR=/Users/travis/build/$user/lk; fi
-  - git clone https://github.com/nrel/lk $LKDIR
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update && sudo apt-get install libglu1-mesa-dev freeglut3-dev mesa-common-dev libgtk2.0-dev; fi
+    - wget -q https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.tar.bz2
+    - tar jxf wxWidgets-3.1.1.tar.bz2
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then (cd wxWidgets-3.1.1 && ./configure --prefix=$HOME/wx-3.1.1 --enable-shared=no --enable-stl=yes --enable-debug=no --with-gtk=2 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin --without-libjbig --without-liblzma --without-gtkprint --with-libnotify=no --with-libmspack=no --with-gnomevfs=no --with-opengl=yes --with-sdl=no --with-cxx=11 && make -j2 all install); fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then (cd wxWidgets-3.1.1 && ./configure --prefix=$HOME/wx-3.1.1 --enable-stl=yes --enable-debug=no --enable-shared=no --with-cocoa --enable-macosx_arch=x86_64 --enable-unicode --enable-webview --with-cxx=11 --with-macosx-version-min=10.9  --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin --disable-mediactrl   && make -j2 all install); fi
+    - sudo ln -s $HOME/wx-3.1.1/bin/wx-config /usr/local/bin/wx-config-3
+    - user=$(echo $TRAVIS_REPO_SLUG | sed 's,/.*$,,')
+    - cd ../
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export LKDIR=/home/travis/build/$user/lk; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export LKDIR=/Users/travis/build/$user/lk; fi
+    - git clone https://github.com/nrel/lk $LKDIR
 
 script:
-  - export PATH=$PATH:$HOME/wx-3.1.1/bin
-  - mkdir ${LKDIR}/build && cd ${LKDIR}/build && cmake .. -DCMAKE_BUILD_TYPE=Release && cmake --build . --target lk -- -j2
-  - cd ${HOME}/build/NREL/wex && cmake . -DCMAKE_BUILD_TYPE=Release && make -j2
+    - export PATH=$PATH:$HOME/wx-3.1.1/bin
+    - mkdir ${LKDIR}/build && cd ${LKDIR}/build && cmake .. -DCMAKE_BUILD_TYPE=Release && cmake --build . --target lk -- -j2
+    - cd ${HOME}/build/NREL/wex && cmake . -DCMAKE_BUILD_TYPE=Release && make -j2
 
 install:
-  # - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libgtk-3-dev; fi
-  # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- 
+# - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libgtk-3-dev; fi
+# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+
 branches:
-  only:
-  - master
-  - develop
-
+    only:
+        - master
+        - develop