aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2018-11-20 23:13:14 -0800
committerMike Buland <eichlan@xagasoft.com>2018-11-20 23:13:14 -0800
commit3a0447e76e279c47b8e57924edc8b6d8dd269a4a (patch)
treea7e2c3b36bd2d4b0b81d5b2383c29da484a68246
parent31fa2d4836ce93993aa94364b1c3dd2195c90142 (diff)
downloadbuild-3a0447e76e279c47b8e57924edc8b6d8dd269a4a.tar.gz
build-3a0447e76e279c47b8e57924edc8b6d8dd269a4a.tar.bz2
build-3a0447e76e279c47b8e57924edc8b6d8dd269a4a.tar.xz
build-3a0447e76e279c47b8e57924edc8b6d8dd269a4a.zip
Correcting build issues.
Diffstat (limited to '')
-rw-r--r--.gitignore12
-rwxr-xr-xbuild.sh10
-rw-r--r--src/ast.cpp2
-rw-r--r--src/buildparser.h4
-rw-r--r--src/location.cpp2
5 files changed, 22 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..533ecb7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
1*.o
2.*.swp
3/build
4/build~
5/.build_cache
6/libbu++
7src/build.tab.c
8src/build.tab.h
9src/build.yy.c
10src/build.yy.h
11/plugins
12
diff --git a/build.sh b/build.sh
index b51e796..29eda52 100755
--- a/build.sh
+++ b/build.sh
@@ -47,19 +47,19 @@ function presetup()
47 cmd BOOTSTRAP minibu/bu/${file} cp bootstrap/${file} minibu/bu 47 cmd BOOTSTRAP minibu/bu/${file} cp bootstrap/${file} minibu/bu
48 done 48 done
49 for F in $BUSRC; do 49 for F in $BUSRC; do
50 bld minibu/src/$F || cmd WGET minibu/src/$F wget -q http://svn.xagasoft.com/libbu++/trunk/src/stable/$F -O minibu/src/$F 50 bld minibu/src/$F || cmd CP minibu/src/$F cp ../libbu++/src/stable/$F minibu/src/$F
51 done 51 done
52 for F in $BUHDR; do 52 for F in $BUHDR; do
53 bld minibu/bu/$F || cmd WGET minibu/bu/$F wget -q http://svn.xagasoft.com/libbu++/trunk/src/stable/$F -O minibu/bu/$F 53 bld minibu/bu/$F || cmd CP minibu/bu/$F cp ../libbu++/src/stable/$F minibu/bu/$F
54 done 54 done
55 for F in $BUEXPSRC; do 55 for F in $BUEXPSRC; do
56 bld minibu/src/$F || cmd WGET minibu/src/$F wget -q http://svn.xagasoft.com/libbu++/trunk/src/experimental/$F -O minibu/src/$F 56 bld minibu/src/$F || cmd CP minibu/src/$F cp ../libbu++/src/experimental/$F minibu/src/$F
57 done 57 done
58 for F in $BUEXPHDR; do 58 for F in $BUEXPHDR; do
59 bld minibu/bu/$F || cmd WGET minibu/bu/$F wget -q http://svn.xagasoft.com/libbu++/trunk/src/experimental/$F -O minibu/bu/$F 59 bld minibu/bu/$F || cmd CP minibu/bu/$F cp ../libbu++/src/experimental/$F minibu/bu/$F
60 done 60 done
61 for F in $BUCOMPAT; do 61 for F in $BUCOMPAT; do
62 bld minibu/bu/$F || cmd WGET minibu/bu/$F wget -q http://svn.xagasoft.com/libbu++/trunk/src/$F -O minibu/bu/$F 62 bld minibu/bu/$F || cmd CP minibu/bu/$F cp ../libbu++/src/$F minibu/bu/$F
63 done 63 done
64 64
65 bld src/build.tab.c src/build.y || cmd BISON src/build.tab.c bison -bsrc/build src/build.y 65 bld src/build.tab.c src/build.y || cmd BISON src/build.tab.c bison -bsrc/build src/build.y
diff --git a/src/ast.cpp b/src/ast.cpp
index 24d3193..4bbe186 100644
--- a/src/ast.cpp
+++ b/src/ast.cpp
@@ -9,7 +9,7 @@
9#include "astleaf.h" 9#include "astleaf.h"
10#include "astbranch.h" 10#include "astbranch.h"
11 11
12#include "build.tab.h" 12#include "buildparser.h"
13 13
14Ast::Ast() 14Ast::Ast()
15{ 15{
diff --git a/src/buildparser.h b/src/buildparser.h
index 47597bb..5337554 100644
--- a/src/buildparser.h
+++ b/src/buildparser.h
@@ -8,6 +8,9 @@
8#ifndef BUILD_PARSER_H 8#ifndef BUILD_PARSER_H
9#define BUILD_PARSER_H 9#define BUILD_PARSER_H
10 10
11typedef void * yyscan_t;
12class BuildParser;
13
11#include "build.tab.h" 14#include "build.tab.h"
12 15
13#include "bu/stack.h" 16#include "bu/stack.h"
@@ -41,7 +44,6 @@ private:
41 Bu::Hash<Bu::String, bool> hConds; 44 Bu::Hash<Bu::String, bool> hConds;
42}; 45};
43 46
44typedef void * yyscan_t;
45#define YY_DECL int build_lex( YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner, BuildParser &b ) 47#define YY_DECL int build_lex( YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner, BuildParser &b )
46YY_DECL; 48YY_DECL;
47 49
diff --git a/src/location.cpp b/src/location.cpp
index 1e2dfcd..507c922 100644
--- a/src/location.cpp
+++ b/src/location.cpp
@@ -6,7 +6,7 @@
6 */ 6 */
7 7
8#include "location.h" 8#include "location.h"
9#include "build.tab.h" 9#include "buildparser.h"
10 10
11Location::Location() : 11Location::Location() :
12 sFile("none"), 12 sFile("none"),