Skip to content
This repository has been archived by the owner on Jun 20, 2021. It is now read-only.

Commit

Permalink
mark achived ROADMAP and update Travis Build config file
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thecarisma
Thecarisma committed May 5, 2019
1 parent d559c55 commit e5356a4
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 16 deletions.
32 changes: 30 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 2,38 @@
language: c

os:
- linux
- windows
#- linux
#- osx

compiler:
- gcc

before_install:
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y mingw; export PATH=/c/tools/mingw64/bin:"$PATH"; fi
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y make; fi

before_script:
#there is no need to configure build toolchain since travis CI comes with
#all needed mingw toolchain for building
#- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then build/Windows-Build.bat -c; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo bash build/Linux-Build.sh -c; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash build/Mac-Build.sh -c; fi

script:
- sudo bash ./Linux-Build.sh x64 -d
- cd build/

#build for windows
#- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then ./Windows-Build.bat x86 -d --gnu; fi
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then ./Windows-Build.bat x64 -d --gnu; fi

#build for linux
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo bash Linux-Build.sh x86 -i; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo bash Linux-Build.sh x64 -i; fi

#build for macos
#since macOS has been 64-bit only since 10.6 there is no need to build 32 bit version
#if there is an exception to build 32 bit version, the repo should be cloned and
#built from source
#- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo bash Mac-Build.sh x86 -i; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo bash Mac-Build.sh x64 -i; fi
4 changes: 2 additions & 2 deletions ROADMAP.MD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 105,8 @@ build, installation, features e.t.c
- [ ] enforce variables to be created using keyword or the Type **?**
- [ ] natively attend to escape characters
- [ ] use the operator method for assignment also, putting the shallow or deep copy option in developer control
- [ ] change 'call' keyword to 'from' for loading module
- [ ] change 'invoke' keyword to 'call' for calling lambda block
- [x] change 'call' keyword to 'from' for loading module
- [x] change 'invoke' keyword to 'call' for calling lambda block
- [ ] change the method **execCode** to **eval**
- [x] use the Error method in classes to attend to error that occur when class access is in braces

Expand Down
11 changes: 3 additions & 8 deletions build/Mac-Build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,14 425,9 @@ uninstall() {
configure() {
header configure "configure build $version"
#MACOSX I believe comes with C/C tool chains
sudo brew install fltk
sudo brew install curl
sudo brew install openssl
case $cpu_arc in
*64* )
#sudo brew install libfltk1.3-dev:i386
;;
esac
brew install fltk
brew install curl
brew install openssl
}

check_if_is_sudo() {
Expand Down
13 changes: 11 additions & 2 deletions build/Windows-Build.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 55,23 @@ for %%x in (%*) do (
)
if "%%x"=="x64" (
SET BUILD_ARC="x64"
SET GCC_ARC_VAR=-m64
SET ARC=64
)
if "%%x"=="--64-bit" (
SET BUILD_ARC="x64"
SET GCC_ARC_VAR=-m64
SET ARC=64
)
if "%%x"=="x86" (
SET BUILD_ARC="x86"
SET GCC_ARC_VAR=-m32
SET ARC=32
)
if "%%x"=="--32-bit" (
SET BUILD_ARC="x86"
SET GCC_ARC_VAR=-m32
SET ARC=32
)
if "%%x"=="--uninstall" (
call:uninstall
Expand Down Expand Up @@ -248,8 256,9 @@ if !BUILD_TOOL!=="cygwin" (
call:locatecygwin !BUILD_ARC!
)
if !BUILD_TOOL!=="gcc" (
call:display configure "configure build %VERSION%"
call:locategcc !BUILD_ARC!
REM call:display configure "configure build %VERSION%"
REM call:locategcc !BUILD_ARC!
SET NO_BUILDTOOL="false"
)
if !BUILD_TOOL!=="any" (
call:configure
Expand Down
4 changes: 2 additions & 2 deletions modules/dynamic_modules/makefiles/Makefile-Windows.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 46,11 @@ clean:
cd ../file_savant/ && $(MAKE) -f Makefile-Windows.mk ARC_FLAG=$(ARC_FLAG) ARC=$(ARC)
cd ../mathic/ && $(MAKE) -f Makefile-Windows.mk ARC_FLAG=$(ARC_FLAG) ARC=$(ARC)
cd ../string_savant/ && $(MAKE) -f Makefile-Windows.mk ARC_FLAG=$(ARC_FLAG) ARC=$(ARC)
cd ../networker/ && $(MAKE) -f Makefile-Windows.mk ARC_FLAG=$(ARC_FLAG) ARC=$(ARC)
cd ../security/ && $(MAKE) -f Makefile-Windows.mk ARC_FLAG=$(ARC_FLAG) ARC=$(ARC)
cd ../simple_sqlite/ && $(MAKE) -f Makefile-Windows.mk ARC_FLAG=$(ARC_FLAG) ARC=$(ARC)
cd ../systemic/ && $(MAKE) -f Makefile-Windows.mk ARC_FLAG=$(ARC_FLAG) ARC=$(ARC)
cd ../core_dynamic_module/ && $(MAKE) -f Makefile-Windows.mk ARC_FLAG=$(ARC_FLAG) ARC=$(ARC)
cd ../networker/ && $(MAKE) -f Makefile-Windows.mk ARC_FLAG=$(ARC_FLAG) ARC=$(ARC)
cd ../security/ && $(MAKE) -f Makefile-Windows.mk ARC_FLAG=$(ARC_FLAG) ARC=$(ARC)

${RM} ${CND_DISTDIR}/build/*.o
${RM} ${CND_DISTDIR}/build/*.d
Expand Down

0 comments on commit e5356a4

Please sign in to comment.