Check-in [1873f32374]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Install in net2o without symlink on Android
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 1873f3237453c760d2e967b677a36ffa0b495803
User & Date: bernd 2016-07-20 01:42:10
Context
2016-07-21
13:42
Bump up Gforth version check-in: 05d0f73e53 user: bernd tags: trunk
2016-07-20
01:42
Install in net2o without symlink on Android check-in: 1873f32374 user: bernd tags: trunk
2016-07-14
13:13
Added postinstall script to check for gpsd check-in: c821edddc7 user: bernd tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Makefile.in.

72
73
74
75
76
77
78
79

80
81
82
83
84
85
86
..
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108

109
110
111
112
113
114
115
116
117
118
119
	  net2o-tools.fs net2o-vault.fs rng.fs termclient.fs xtype.fs	\
	  $(TESTS) $(FORTHLIB) ed25519-donnalib.fs keccaklib.fs		\
	  threefishlib.fs startn2o.fs doc/net2o-logo.png		\
	  net2o-version.fs.in android/net.fs android/notify.fs		\
	  linux/net.fs linux/notify.fs net2o-dhtroot.fs net2o-dvcs.fs	\
	  android/qrscan.fs

SRCDIRS = net2o-@PACKAGE_VERSION@/tests net2o-@PACKAGE_VERSION@/doc net2o-@PACKAGE_VERSION@/android net2o-@PACKAGE_VERSION@/linux


SCRIPTS = n2o

GEN = net2o-version.fs

DOC = wiki/commands.md

................................................................................

no-config: libs $(GEN)

clean:
	for i in $(LIBS); do (cd $$i; $(MAKE) clean); done

configs:
	for i in $(LIBS); do (cd $$i; ./autogen.sh CFLAGS="$(subst O2,O3,$(CFLAGS))" --host=$(HOST) --prefix=$(PREFIX) && $(MAKE) clean); done

libs:
	for i in $(LIBS); do (cd $$i; $(MAKE)); done

install-libs:
	for i in $(LIBS); do (cd $$i; $(MAKE) package=$(package) install); done

extra-install:	install-libs install

install:	libcc-install
	for i in $(SRCDIRS); do \
		$(MKDIR) -p $(datadir)/gforth/$(VERSION)/$$i; \
	done

	for i in $(SOURCES) $(GEN); do \
		$(INSTALL_DATA) ./$$i $(datadir)/gforth/$(VERSION)/net2o-@PACKAGE_VERSION@/$$i; \
	done
	ln -fs net2o-@PACKAGE_VERSION@ $(datadir)/gforth/$(VERSION)/net2o
	$(MKDIR) -p $(bindir)
	for i in $(SCRIPTS); do \
		$(INSTALL_SCRIPT) ./$$i $(bindir)/$$i-@PACKAGE_VERSION@; \
		ln -fs $$i-@PACKAGE_VERSION@ $(bindir)/$$i; \
	done

libcc:	$(FORTHLIB)







|
>







 







|













>

|

<







72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
..
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113

114
115
116
117
118
119
120
	  net2o-tools.fs net2o-vault.fs rng.fs termclient.fs xtype.fs	\
	  $(TESTS) $(FORTHLIB) ed25519-donnalib.fs keccaklib.fs		\
	  threefishlib.fs startn2o.fs doc/net2o-logo.png		\
	  net2o-version.fs.in android/net.fs android/notify.fs		\
	  linux/net.fs linux/notify.fs net2o-dhtroot.fs net2o-dvcs.fs	\
	  android/qrscan.fs

@VERDIR@SRCDIRS = net2o-@PACKAGE_VERSION@/tests net2o-@PACKAGE_VERSION@/doc net2o-@PACKAGE_VERSION@/android net2o-@PACKAGE_VERSION@/linux
@NOVERDIR@SRCDIRS = net2o/tests net2o/doc net2o/android net2o/linux

SCRIPTS = n2o

GEN = net2o-version.fs

DOC = wiki/commands.md

................................................................................

no-config: libs $(GEN)

clean:
	for i in $(LIBS); do (cd $$i; $(MAKE) clean); done

configs:
	for i in . $(LIBS); do (cd $$i; ./autogen.sh CFLAGS="$(subst O2,O3,$(CFLAGS))" --host=$(HOST) --prefix=$(PREFIX) && $(MAKE) clean); done

libs:
	for i in $(LIBS); do (cd $$i; $(MAKE)); done

install-libs:
	for i in $(LIBS); do (cd $$i; $(MAKE) package=$(package) install); done

extra-install:	install-libs install

install:	libcc-install
	for i in $(SRCDIRS); do \
		$(MKDIR) -p $(datadir)/gforth/$(VERSION)/$$i; \
	done
	@VERDIR@ln -fs net2o-@PACKAGE_VERSION@ $(datadir)/gforth/$(VERSION)/net2o
	for i in $(SOURCES) $(GEN); do \
		$(INSTALL_DATA) ./$$i $(datadir)/gforth/$(VERSION)/net2o/$$i; \
	done

	$(MKDIR) -p $(bindir)
	for i in $(SCRIPTS); do \
		$(INSTALL_SCRIPT) ./$$i $(bindir)/$$i-@PACKAGE_VERSION@; \
		ln -fs $$i-@PACKAGE_VERSION@ $(bindir)/$$i; \
	done

libcc:	$(FORTHLIB)

Changes to configure.ac.

45
46
47
48
49
50
51













52
53
54
55
56
57
58
	FAST=yes
	;;
    i686-linux-android)
	FAST=yes
	;;
esac














AC_PROG_CC
AC_PROG_INSTALL

PRECC=${CC%gcc*}
PRECLANG=${PRECC%clang*}
dnl MacOS X has a libtool that does something else
AC_CHECK_PROGS(GNU_LIBTOOL,"glibtool --tag=CC" libtool)







>
>
>
>
>
>
>
>
>
>
>
>
>







45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
	FAST=yes
	;;
    i686-linux-android)
	FAST=yes
	;;
esac

VERDIR=
NOVERDIR='#'

case "$host_alias" in
    *android*)
	VERDIR='#'
	NOVERDIR=
	;;
esac

AC_SUBST(VERDIR)
AC_SUBST(NOVERDIR)

AC_PROG_CC
AC_PROG_INSTALL

PRECC=${CC%gcc*}
PRECLANG=${PRECC%clang*}
dnl MacOS X has a libtool that does something else
AC_CHECK_PROGS(GNU_LIBTOOL,"glibtool --tag=CC" libtool)

Changes to net2o-msg.fs.

232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
    [THEN]
[THEN]

: .coords ( addr u -- ) $>align drop
    dup 0 sf[]@ fdup fabs .deg f0< 'S' 'N' rot select emit space
    dup 1 sf[]@ fdup fabs .deg f0< 'W' 'E' rot select emit space
    dup 2 sf[]@ 7 1 0 f.rdp ." m "
    dup 3 sf[]@ 8 2 0 f.rdp ." kph "
    dup 4 sf[]@ 8 2 0 f.rdp ." ° ~"
    dup 5 sf[]@ fsplit 0 .r '.' emit 100e f* f>s .2 ." m"
    drop ;

Defer msg:last?
Defer msg:last
Defer msg:getlast







|







232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
    [THEN]
[THEN]

: .coords ( addr u -- ) $>align drop
    dup 0 sf[]@ fdup fabs .deg f0< 'S' 'N' rot select emit space
    dup 1 sf[]@ fdup fabs .deg f0< 'W' 'E' rot select emit space
    dup 2 sf[]@ 7 1 0 f.rdp ." m "
    dup 3 sf[]@ 8 2 0 f.rdp ." km/h "
    dup 4 sf[]@ 8 2 0 f.rdp ." ° ~"
    dup 5 sf[]@ fsplit 0 .r '.' emit 100e f* f>s .2 ." m"
    drop ;

Defer msg:last?
Defer msg:last
Defer msg:getlast

Changes to net2o-qr.fs.

12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
\ GNU Affero General Public License for more details.

\ You should have received a copy of the GNU Affero General Public License
\ along with this program.  If not, see <http://www.gnu.org/licenses/>.

require net2o-tools.fs
require ansi.fs

'▀' Constant upper-half-block
\ '▄' Constant lower-half-block
\ '█' Constant solid-block

20 Constant keyqr# \ key qr codes are 20x20 blocks
keyqr# dup * Constant keyqr#²







<







12
13
14
15
16
17
18

19
20
21
22
23
24
25
\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
\ GNU Affero General Public License for more details.

\ You should have received a copy of the GNU Affero General Public License
\ along with this program.  If not, see <http://www.gnu.org/licenses/>.

require net2o-tools.fs


'▀' Constant upper-half-block
\ '▄' Constant lower-half-block
\ '█' Constant solid-block

20 Constant keyqr# \ key qr codes are 20x20 blocks
keyqr# dup * Constant keyqr#²

Changes to net2o.fs.

18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
\ helper words

require net2o-version.fs
require net2o-err.fs

\ required tools

require ansi.fs
require mini-oof2.fs
require user-object.fs
require rec-scope.fs
require unix/socket.fs
require unix/mmap.fs
require unix/pthread.fs
require unix/filestat.fs







<







18
19
20
21
22
23
24

25
26
27
28
29
30
31
\ helper words

require net2o-version.fs
require net2o-err.fs

\ required tools


require mini-oof2.fs
require user-object.fs
require rec-scope.fs
require unix/socket.fs
require unix/mmap.fs
require unix/pthread.fs
require unix/filestat.fs