diff --git a/README.MD b/README.MD index 17aa3831..d3548ede 100644 --- a/README.MD +++ b/README.MD @@ -16,7 +16,7 @@ ___ ___ -[![Download simple-lang](https://a.fsdn.com/con/app/sf-download-button)](https://sourceforge.net/projects/simple-lang/files/s0.4.0/) +[![Download simple-lang](https://a.fsdn.com/con/app/sf-download-button)](https://sourceforge.net/projects/simple-lang/files/s0.4.1/) ## Building from source diff --git a/build/Android-Termux-Build.sh b/build/Android-Termux-Build.sh index 5fd559d4..3ee4d450 100644 --- a/build/Android-Termux-Build.sh +++ b/build/Android-Termux-Build.sh @@ -4,7 +4,7 @@ clear exec_type="" build_arc="x64" -ver=0.4.0 +ver=0.4.1 keep_dist="false" version=s"$ver" simple_debug_version=$version-debug @@ -393,9 +393,14 @@ configure() { pkg update && pkg upgrade pkg install make pkg install clang + pkg install pkg-config pkg install libcurl-dev pkg install openssl-dev pkg install libsqlite-dev + pkg install libx11-dev + pkg install libxft-dev + pkg install libxcursor-dev + pkg install libxinerama-dev } help() { diff --git a/build/Linux-Build.sh b/build/Linux-Build.sh index 9c82922e..a88b0b4b 100755 --- a/build/Linux-Build.sh +++ b/build/Linux-Build.sh @@ -4,7 +4,7 @@ clear exec_type="" build_arc="x64" -ver=0.4.0 +ver=0.4.1 keep_dist="false" version=s"$ver" simple_debug_version=$version-debug @@ -612,7 +612,7 @@ finalize_installation() { echo " Minifying Source code for modules " echo "=======================================" - minifier -s /var/lib/simple/s0.4.0/modules -y + minifier -s /var/lib/simple/s0.4.1/modules -y header build "testing installtion > simple" # echo treat_first_calls_file() diff --git a/build/Mac-Build.sh b/build/Mac-Build.sh index b524a1f4..37fa0bba 100644 --- a/build/Mac-Build.sh +++ b/build/Mac-Build.sh @@ -4,7 +4,7 @@ clear exec_type="" build_arc="x86" -ver=0.4.0 +ver=0.4.1 keep_dist="false" version=s"$ver" simple_debug_version=$version-debug @@ -587,7 +587,7 @@ finalize_installation() { echo " Minifying Source code for modules " echo "=======================================" - minifier -s /var/lib/simple/s0.4.0/modules -y + minifier -s /var/lib/simple/s0.4.1/modules -y header build "testing installtion > simple" # echo treat_first_calls_file() diff --git a/build/Windows-Build.bat b/build/Windows-Build.bat index 6f528d8c..db63face 100644 --- a/build/Windows-Build.bat +++ b/build/Windows-Build.bat @@ -5,12 +5,12 @@ setlocal enabledelayedexpansion SET EXEC_TYPE="" SET BUILD_ARC="x86" -SET VER=0.4.0 +SET VER=0.4.1 SET THERE_IS_VS="false" SET KEEP_DIST="false" SET INSTALLATION_FOLDER=C:\Simple\ -SET VERSION=s0.4.0 -SET SIMPLE_DEBUG_VERSION=s0.4.0-debug +SET VERSION=s0.4.1 +SET SIMPLE_DEBUG_VERSION=s0.4.1-debug SET FULLTICK_BUILD_ISSUE="" SET BUILD_TOOL="any" SET NO_BUILDTOOL="true" diff --git a/environment/suplement/suplement.json b/environment/suplement/suplement.json index 113f152d..b0208ac6 100644 --- a/environment/suplement/suplement.json +++ b/environment/suplement/suplement.json @@ -1,5 +1,5 @@ { - "Version": "0.4.0", + "Version": "0.4.1", "UpdateJsonAddress": "http://localhost/simple-lang/updater/update.json", "InstallationDir": "$EXEC_DIR" } \ No newline at end of file diff --git a/examples/conf.sim b/examples/conf.sim index 436dfe2f..149cb3f9 100644 --- a/examples/conf.sim +++ b/examples/conf.sim @@ -3,7 +3,7 @@ project = 'Simple Examples' copyright = '2018-2019, Azeez Adewale and the Simple Community (MIT)' author = 'Azeez Adewale' -version = '0.4.0' +version = '0.4.1' conf_py_dump = ' import simple_lexer diff --git a/examples/more/sqlite_c.sim b/examples/more/sqlite_c.sim index e36b7d50..862072ef 100644 --- a/examples/more/sqlite_c.sim +++ b/examples/more/sqlite_c.sim @@ -47,14 +47,14 @@ query = " query = " INSERT INTO Downloads (Name,Type,OS,OS_Code,Arch,Size,Version,Link,Date) - VALUES ('simple0.4.0-windows_i386.exe', 'Installer', 'Windows', 'windows_amd64', 'x64', '12MB', 'simple0.4.0', 'https://sourceforge.net/projects/simple-lang/files/s0.3.36/simple0.3.36-windows_amd64.exe/download', '" + date.ToString() + "' ); + VALUES ('simple0.4.1-windows_i386.exe', 'Installer', 'Windows', 'windows_amd64', 'x64', '12MB', 'simple0.4.1', 'https://sourceforge.net/projects/simple-lang/files/s0.3.36/simple0.3.36-windows_amd64.exe/download', '" + date.ToString() + "' ); " #display __sqlite3_exec(db, query) #display __sqlite3_errmsg(db) + nl query = " INSERT INTO Downloads (Name,Type,OS,OS_Code,Arch,Size,Version,Link,Date) - VALUES ('simple0.4.0-linux_amd64.deb', 'Installer', 'Linux', 'windows_amd64', 'x86', '12MB', 'simple0.4.0', 'https://sourceforge.net/projects/simple-lang/files/s0.3.36/simple0.3.36-windows_amd64.zip/download', '" + date.ToString() + "' ); + VALUES ('simple0.4.1-linux_amd64.deb', 'Installer', 'Linux', 'windows_amd64', 'x86', '12MB', 'simple0.4.1', 'https://sourceforge.net/projects/simple-lang/files/s0.3.36/simple0.3.36-windows_amd64.zip/download', '" + date.ToString() + "' ); " display __sqlite3_exec(db, query) display __sqlite3_errmsg(db) + nl diff --git a/examples/testfiles/test.txt b/examples/testfiles/test.txt index 069e7093..8329c355 100644 --- a/examples/testfiles/test.txt +++ b/examples/testfiles/test.txt @@ -1,4 +1,4 @@ Hello World -From simple-lang 0.4.0 +From simple-lang 0.4.1 Thank You \ No newline at end of file diff --git a/examples/testfiles/update_file.json b/examples/testfiles/update_file.json index ddbb36a0..e6965849 100644 --- a/examples/testfiles/update_file.json +++ b/examples/testfiles/update_file.json @@ -1,5 +1,5 @@ { - "Version": "0.4.0", + "Version": "0.4.1", "Date Updated": null, "Update Message": "Hello World this is simple the main thingy", "Updates": [ diff --git a/modules/conf.sim b/modules/conf.sim index 26143b5b..99070620 100644 --- a/modules/conf.sim +++ b/modules/conf.sim @@ -3,7 +3,7 @@ project = 'Simple Modules' copyright = '2018-2019, Azeez Adewale and the Simple Community (MIT)' author = 'Azeez Adewale' -version = '0.4.0' +version = '0.4.1' conf_py_dump = ' import simple_lexer diff --git a/modules/dynamic_modules/makefiles/Makefile-Linux.mk b/modules/dynamic_modules/makefiles/Makefile-Linux.mk index 59e9b014..13eb97f8 100644 --- a/modules/dynamic_modules/makefiles/Makefile-Linux.mk +++ b/modules/dynamic_modules/makefiles/Makefile-Linux.mk @@ -36,7 +36,7 @@ RM=rm MAKE=make # Macros -VERSION=s0.4.0 +VERSION=s0.4.1 CND_PLATFORM=Linux CND_DLIB_EXT=dysim CND_DISTDIR=../dist diff --git a/modules/dynamic_modules/makefiles/Makefile-Mac.mk b/modules/dynamic_modules/makefiles/Makefile-Mac.mk index 367bcbcd..60ab51b4 100644 --- a/modules/dynamic_modules/makefiles/Makefile-Mac.mk +++ b/modules/dynamic_modules/makefiles/Makefile-Mac.mk @@ -36,7 +36,7 @@ RM=rm MAKE=make # Macros -VERSION=s0.4.0 +VERSION=s0.4.1 CND_PLATFORM=Linux CND_DLIB_EXT=dysim CND_DISTDIR=../dist diff --git a/modules/dynamic_modules/makefiles/Makefile-Windows.mk b/modules/dynamic_modules/makefiles/Makefile-Windows.mk index aebe4641..7f16f4ef 100644 --- a/modules/dynamic_modules/makefiles/Makefile-Windows.mk +++ b/modules/dynamic_modules/makefiles/Makefile-Windows.mk @@ -38,7 +38,7 @@ RM=rm CND_PLATFORM=Windows CND_DLIB_EXT=dysim CND_DISTDIR=../dist -CLEAN_DEBUGDIR=../../../s0.4.0-debug +CLEAN_DEBUGDIR=../../../s0.4.1-debug DYNAMIC_MODULEDIR=.modules/dynamic_modules clean: diff --git a/modules/simple/system/SimpleX.sim b/modules/simple/system/SimpleX.sim index 3f0692d2..b9d613b4 100644 --- a/modules/simple/system/SimpleX.sim +++ b/modules/simple/system/SimpleX.sim @@ -67,14 +67,14 @@ __simpleResDir = null @Code #Windows C:\\Simple\\ #-> the simple directory - .\\s0.4.0\\ - .\\s0.4.0\\ - .\\s0.4.00\\ + .\\s0.4.1\\ + .\\s0.4.1\\ + .\\s0.4.10\\ #linux /var/lib/simple/ #-> the simple directory - .\\s0.4.0\\ - .\\s0.4.0\\ - .\\s0.4.00\\ + .\\s0.4.1\\ + .\\s0.4.1\\ + .\\s0.4.10\\ @EndCode @return the simple-lang installation directory @DataType String */ diff --git a/simple/include/simple.h b/simple/include/simple.h index 81af376a..cd220e36 100644 --- a/simple/include/simple.h +++ b/simple/include/simple.h @@ -107,7 +107,7 @@ must be set through the compiler flag either through makefile or command line */ #include #include #include -#define SIMPLE_ANDROID_LOG "simple-lang:0.4.0" +#define SIMPLE_ANDROID_LOG "simple-lang:0.4.1" /* Make fprintf function custom to allow output in android designated std(s)*/ /* ANDROID_LOG_DEBUG - stdout, ANDROID_LOG_ERROR - stderr */ diff --git a/simple/include/simple_misc.h b/simple/include/simple_misc.h index 4d86bdca..2887c165 100644 --- a/simple/include/simple_misc.h +++ b/simple/include/simple_misc.h @@ -37,7 +37,7 @@ typedef struct GCData { } GCData ; #define SIMPLE_NAME "simple" -#define SIMPLE_VERSION "0.4.0" +#define SIMPLE_VERSION "0.4.1" #define PRIMARY_AUTHOR "Azeez Adewale" #define START_YEAR 2018 #define CURRENT_YEAR 2019 diff --git a/simple/include/simple_object.h b/simple/include/simple_object.h index 60c2aadc..498bd32a 100644 --- a/simple/include/simple_object.h +++ b/simple/include/simple_object.h @@ -22,7 +22,7 @@ //#define DEBUG_OBJFILE #define SIMPLE_OBJECT_HEAD_SIZE 11 -#define SIMPLE_OBJECT_HEAD "simple0.4.0" +#define SIMPLE_OBJECT_HEAD "simple0.4.1" #define SIMPLE_OBJECT_KEY "simple" #define SIMPLE_OBJECT_KEY_SIZE 6 diff --git a/simple/makefiles/Makefile-Android-Termux.mk b/simple/makefiles/Makefile-Android-Termux.mk index 8708d58d..1d276b2b 100644 --- a/simple/makefiles/Makefile-Android-Termux.mk +++ b/simple/makefiles/Makefile-Android-Termux.mk @@ -24,13 +24,13 @@ LDFLAGS= -L ./ -Wl, "-Wl,--no-as-needed" AR_FLAGS=rcs # Macros -VER=0.4.0 +VER=0.4.1 VERSION=s"$VER" CND_PLATFORM= CND_DLIB_EXT=so CND_BUILDDIR=build CND_DISTDIR =../dist -CLEAN_DEBUGDIR=../../../s0.4.0-debug +CLEAN_DEBUGDIR=../../../s0.4.1-debug BINARYDIR=bin SOURCE_DIR=../sources INCLUDES_DIR=../include diff --git a/simple/makefiles/Makefile-Linux.mk b/simple/makefiles/Makefile-Linux.mk index 670ed8f5..f0a013de 100644 --- a/simple/makefiles/Makefile-Linux.mk +++ b/simple/makefiles/Makefile-Linux.mk @@ -24,13 +24,13 @@ LDFLAGS= -L ./ "-Wl,-rpath,./" "-Wl,-rpath,../lib/" "-Wl,-rpath,$(DESTDIR)$(PREF AR_FLAGS=rcs # Macros -VER=0.4.0 +VER=0.4.1 VERSION=s"$VER" CND_PLATFORM= CND_DLIB_EXT=so CND_BUILDDIR=build CND_DISTDIR =../dist -CLEAN_DEBUGDIR=../../../s0.4.0-debug +CLEAN_DEBUGDIR=../../../s0.4.1-debug BINARYDIR=bin SOURCE_DIR=../sources INCLUDES_DIR=../include diff --git a/simple/makefiles/Makefile-Mac.mk b/simple/makefiles/Makefile-Mac.mk index df8daea0..7cae3090 100644 --- a/simple/makefiles/Makefile-Mac.mk +++ b/simple/makefiles/Makefile-Mac.mk @@ -24,13 +24,13 @@ LDFLAGS= AR_FLAGS=rcs # Macros -VER=0.4.0 +VER=0.4.1 VERSION=s"$VER" CND_PLATFORM= CND_DLIB_EXT=dylib CND_BUILDDIR=build CND_DISTDIR =../dist -CLEAN_DEBUGDIR=../../../s0.4.0-debug +CLEAN_DEBUGDIR=../../../s0.4.1-debug BINARYDIR=bin SOURCE_DIR=../sources INCLUDES_DIR=../include diff --git a/simple/makefiles/Makefile-Windows.mk b/simple/makefiles/Makefile-Windows.mk index d1a93d78..90b5a05a 100644 --- a/simple/makefiles/Makefile-Windows.mk +++ b/simple/makefiles/Makefile-Windows.mk @@ -36,13 +36,13 @@ CXXFLAGS= AR_FLAGS=rcs # Macros -VERSION=s0.4.0 +VERSION=s0.4.1 CND_PLATFORM= CND_DLIB_EXT=dll CND_DEXE_EXT=exe CND_BUILDDIR=build CND_DISTDIR=../dist -CLEAN_DEBUGDIR=../../../s0.4.0-debug +CLEAN_DEBUGDIR=../../../s0.4.1-debug BINARYDIR=bin # Object Directory