Skip to content

Commit 5f6c63c

Browse files
tranleduy2000tranleduy2000
committed
Application id variable
1 parent bda3cc9 commit 5f6c63c

File tree

6 files changed

+250
-11
lines changed

6 files changed

+250
-11
lines changed

‎cctools-repo/build-shell-utils.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ mpc_version="1.0.1"
99
mpfr_version="3.1.1"
1010
cloog_version="0.18.0"
1111
isl_version="0.11.1"
12-
ppl_version="1.0"
12+
ppl_version="1.1"
1313

1414
make_version="4.0"
1515
nano_version="2.2.6"
@@ -21,6 +21,7 @@ gcc_avr_version="4.9.3"
2121
gcc_mingw_version="4.9.3"
2222

2323
TARGET_INST_DIR="/data/data/com.duy.c.cpp.compiler/root/cctools"
24+
APPLICATION_ID="com.duy.c.cpp.compiler"
2425
#TARGET_INST_DIR="/data/data/com.pdaxrom.cctools/root/cctools"
2526
#TARGET_INST_DIR="/data/data/com.pdaxrom.cctools/cache/cctools"
2627

‎cctools-repo/build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ export PATH=~/bin/CodeSourcery/bin:$PATH
2727

2828
#./build-shell-utils.sh ${PWD}/src mipsel-linux-android ${WRKDIR}/mips-repo $NDKDIR $SDKDIR || exit 1
2929

30-
./build-shell-utils.sh ${PWD}/src i686-linux-android ${WRKDIR}/i686-repo $NDKDIR $SDKDIR || exit 1
30+
#./build-shell-utils.sh ${PWD}/src i686-linux-android ${WRKDIR}/i686-repo $NDKDIR $SDKDIR || exit 1
3131

32-
./build-shell-utils.sh ${PWD}/src aarch64-linux-android ${WRKDIR}/arm64-repo $NDKDIR $SDKDIR || exit 1
32+
#./build-shell-utils.sh ${PWD}/src aarch64-linux-android ${WRKDIR}/arm64-repo $NDKDIR $SDKDIR || exit 1
3333

3434
#./build-shell-utils.sh ${PWD}/src mips64el-linux-android ${WRKDIR}/mips64-repo $NDKDIR $SDKDIR || exit 1
3535

‎cctools-repo/patches/ppl-1.0.patch‎

Lines changed: 238 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,238 @@
1+
Index: ppl-1.0/src/CO_Tree.cc
2+
IDEA additional info:
3+
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
4+
<+>UTF-8
5+
===================================================================
6+
--- ppl-1.0/src/CO_Tree.cc (date 1527407516000)
7+
+++ ppl-1.0/src/CO_Tree.cc (date 1527407567000)
8+
@@ -933,7 +933,7 @@
9+
--subtree_size;
10+
}
11+
12+
- ptrdiff_t distance = first_unused_index - indexes;
13+
+ std::ptrdiff_t distance = first_unused_index - indexes;
14+
PPL_ASSERT(distance >= 0);
15+
return static_cast<dimension_type>(distance);
16+
}
17+
Index: ppl-1.0/src/CO_Tree.defs.hh
18+
IDEA additional info:
19+
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
20+
<+>UTF-8
21+
===================================================================
22+
--- ppl-1.0/src/CO_Tree.defs.hh (date 1527407516000)
23+
+++ ppl-1.0/src/CO_Tree.defs.hh (date 1527407567000)
24+
@@ -159,7 +159,7 @@
25+
26+
typedef std::bidirectional_iterator_tag iterator_category;
27+
typedef const data_type value_type;
28+
- typedef ptrdiff_t difference_type;
29+
+ typedef std::ptrdiff_t difference_type;
30+
typedef value_type* pointer;
31+
typedef data_type_const_reference reference;
32+
33+
@@ -314,7 +314,7 @@
34+
35+
typedef std::bidirectional_iterator_tag iterator_category;
36+
typedef data_type value_type;
37+
- typedef ptrdiff_t difference_type;
38+
+ typedef std::ptrdiff_t difference_type;
39+
typedef value_type* pointer;
40+
typedef value_type& reference;
41+
42+
Index: ppl-1.0/src/CO_Tree.inlines.hh
43+
IDEA additional info:
44+
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
45+
<+>UTF-8
46+
===================================================================
47+
--- ppl-1.0/src/CO_Tree.inlines.hh (date 1527407516000)
48+
+++ ppl-1.0/src/CO_Tree.inlines.hh (date 1527407567000)
49+
@@ -31,7 +31,7 @@
50+
PPL_ASSERT(itr.current_index != 0);
51+
PPL_ASSERT(itr.current_index >= indexes + 1);
52+
PPL_ASSERT(itr.current_index <= indexes + reserved_size);
53+
- const ptrdiff_t index = itr.current_index - indexes;
54+
+ const std::ptrdiff_t index = itr.current_index - indexes;
55+
return static_cast<dimension_type>(index);
56+
}
57+
58+
@@ -40,7 +40,7 @@
59+
PPL_ASSERT(itr.current_index != 0);
60+
PPL_ASSERT(itr.current_index >= indexes + 1);
61+
PPL_ASSERT(itr.current_index <= indexes + reserved_size);
62+
- const ptrdiff_t index = itr.current_index - indexes;
63+
+ const std::ptrdiff_t index = itr.current_index - indexes;
64+
return static_cast<dimension_type>(index);
65+
}
66+
67+
@@ -768,7 +768,7 @@
68+
p -= (offset - 1);
69+
while (*p == unused_index)
70+
++p;
71+
- ptrdiff_t distance = p - tree.indexes;
72+
+ std::ptrdiff_t distance = p - tree.indexes;
73+
PPL_ASSERT(distance >= 0);
74+
i = static_cast<dimension_type>(distance);
75+
offset = least_significant_one_mask(i);
76+
@@ -783,7 +783,7 @@
77+
p += (offset - 1);
78+
while (*p == unused_index)
79+
--p;
80+
- ptrdiff_t distance = p - tree.indexes;
81+
+ std::ptrdiff_t distance = p - tree.indexes;
82+
PPL_ASSERT(distance >= 0);
83+
i = static_cast<dimension_type>(distance);
84+
offset = least_significant_one_mask(i);
85+
Index: ppl-1.0/src/Dense_Row.defs.hh
86+
IDEA additional info:
87+
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
88+
<+>UTF-8
89+
===================================================================
90+
--- ppl-1.0/src/Dense_Row.defs.hh (date 1527407516000)
91+
+++ ppl-1.0/src/Dense_Row.defs.hh (date 1527407567000)
92+
@@ -433,7 +433,7 @@
93+
94+
typedef std::bidirectional_iterator_tag iterator_category;
95+
typedef Coefficient value_type;
96+
- typedef ptrdiff_t difference_type;
97+
+ typedef std::ptrdiff_t difference_type;
98+
typedef value_type* pointer;
99+
typedef value_type& reference;
100+
101+
@@ -474,7 +474,7 @@
102+
public:
103+
104+
typedef const Coefficient value_type;
105+
- typedef ptrdiff_t difference_type;
106+
+ typedef std::ptrdiff_t difference_type;
107+
typedef value_type* pointer;
108+
typedef Coefficient_traits::const_reference reference;
109+
110+
Index: ppl-1.0/src/Linear_Expression.defs.hh
111+
IDEA additional info:
112+
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
113+
<+>UTF-8
114+
===================================================================
115+
--- ppl-1.0/src/Linear_Expression.defs.hh (date 1527407516000)
116+
+++ ppl-1.0/src/Linear_Expression.defs.hh (date 1527407567000)
117+
@@ -502,7 +502,7 @@
118+
public:
119+
typedef std::bidirectional_iterator_tag iterator_category;
120+
typedef const Coefficient value_type;
121+
- typedef ptrdiff_t difference_type;
122+
+ typedef std::ptrdiff_t difference_type;
123+
typedef value_type* pointer;
124+
typedef Coefficient_traits::const_reference reference;
125+
126+
Index: ppl-1.0/src/Linear_Expression_Interface.defs.hh
127+
IDEA additional info:
128+
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
129+
<+>UTF-8
130+
===================================================================
131+
--- ppl-1.0/src/Linear_Expression_Interface.defs.hh (date 1527407516000)
132+
+++ ppl-1.0/src/Linear_Expression_Interface.defs.hh (date 1527407567000)
133+
@@ -65,7 +65,7 @@
134+
public:
135+
typedef std::bidirectional_iterator_tag iterator_category;
136+
typedef const Coefficient value_type;
137+
- typedef ptrdiff_t difference_type;
138+
+ typedef std::ptrdiff_t difference_type;
139+
typedef value_type* pointer;
140+
typedef Coefficient_traits::const_reference reference;
141+
142+
Index: ppl-1.0/src/ppl.hh.dist
143+
IDEA additional info:
144+
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
145+
<+>UTF-8
146+
===================================================================
147+
--- ppl-1.0/src/ppl.hh.dist (date 1527407516000)
148+
+++ ppl-1.0/src/ppl.hh.dist (date 1527407567000)
149+
@@ -20151,7 +20151,7 @@
150+
151+
typedef std::bidirectional_iterator_tag iterator_category;
152+
typedef Coefficient value_type;
153+
- typedef ptrdiff_t difference_type;
154+
+ typedef std::ptrdiff_t difference_type;
155+
typedef value_type* pointer;
156+
typedef value_type& reference;
157+
158+
@@ -20192,7 +20192,7 @@
159+
public:
160+
161+
typedef const Coefficient value_type;
162+
- typedef ptrdiff_t difference_type;
163+
+ typedef std::ptrdiff_t difference_type;
164+
typedef value_type* pointer;
165+
typedef Coefficient_traits::const_reference reference;
166+
167+
@@ -20974,7 +20974,7 @@
168+
169+
typedef std::bidirectional_iterator_tag iterator_category;
170+
typedef const data_type value_type;
171+
- typedef ptrdiff_t difference_type;
172+
+ typedef std::ptrdiff_t difference_type;
173+
typedef value_type* pointer;
174+
typedef data_type_const_reference reference;
175+
176+
@@ -21129,7 +21129,7 @@
177+
178+
typedef std::bidirectional_iterator_tag iterator_category;
179+
typedef data_type value_type;
180+
- typedef ptrdiff_t difference_type;
181+
+ typedef std::ptrdiff_t difference_type;
182+
typedef value_type* pointer;
183+
typedef value_type& reference;
184+
185+
@@ -22369,7 +22369,7 @@
186+
PPL_ASSERT(itr.current_index != 0);
187+
PPL_ASSERT(itr.current_index >= indexes + 1);
188+
PPL_ASSERT(itr.current_index <= indexes + reserved_size);
189+
- const ptrdiff_t index = itr.current_index - indexes;
190+
+ const std::ptrdiff_t index = itr.current_index - indexes;
191+
return static_cast<dimension_type>(index);
192+
}
193+
194+
@@ -22378,7 +22378,7 @@
195+
PPL_ASSERT(itr.current_index != 0);
196+
PPL_ASSERT(itr.current_index >= indexes + 1);
197+
PPL_ASSERT(itr.current_index <= indexes + reserved_size);
198+
- const ptrdiff_t index = itr.current_index - indexes;
199+
+ const std::ptrdiff_t index = itr.current_index - indexes;
200+
return static_cast<dimension_type>(index);
201+
}
202+
203+
@@ -23106,7 +23106,7 @@
204+
p -= (offset - 1);
205+
while (*p == unused_index)
206+
++p;
207+
- ptrdiff_t distance = p - tree.indexes;
208+
+ std::ptrdiff_t distance = p - tree.indexes;
209+
PPL_ASSERT(distance >= 0);
210+
i = static_cast<dimension_type>(distance);
211+
offset = least_significant_one_mask(i);
212+
@@ -23121,7 +23121,7 @@
213+
p += (offset - 1);
214+
while (*p == unused_index)
215+
--p;
216+
- ptrdiff_t distance = p - tree.indexes;
217+
+ std::ptrdiff_t distance = p - tree.indexes;
218+
PPL_ASSERT(distance >= 0);
219+
i = static_cast<dimension_type>(distance);
220+
offset = least_significant_one_mask(i);
221+
@@ -24749,7 +24749,7 @@
222+
public:
223+
typedef std::bidirectional_iterator_tag iterator_category;
224+
typedef const Coefficient value_type;
225+
- typedef ptrdiff_t difference_type;
226+
+ typedef std::ptrdiff_t difference_type;
227+
typedef value_type* pointer;
228+
typedef Coefficient_traits::const_reference reference;
229+
230+
@@ -27158,7 +27158,7 @@
231+
public:
232+
typedef std::bidirectional_iterator_tag iterator_category;
233+
typedef const Coefficient value_type;
234+
- typedef ptrdiff_t difference_type;
235+
+ typedef std::ptrdiff_t difference_type;
236+
typedef value_type* pointer;
237+
typedef Coefficient_traits::const_reference reference;
238+

‎cctools-repo/rules/dropbear.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ EOF
8484
8585
fret=\${CCTOOLSDIR}/tmp/adialog\$\$
8686
87-
am start \$(am 2>&1 | grep -q '\-\-user' && echo '--user 0') -n com.pdaxrom.cctools/.ADialog \\
87+
am start \$(am 2>&1 | grep -q '\-\-user' && echo '--user 0') -n ${APPLICATION_ID}/.ADialog \\
8888
--es type editbox \\
8989
--ez password true \\
9090
--es title "Dropbear SSH server" \\
@@ -115,7 +115,7 @@ if [ -f \${fret}.lock ]; then
115115
iface=\`ip r l | grep default | head -n1 | awk '{ for (i = 1; \$i != ""; i++) { if (\$i == "dev") print \$(i + 1) } }'\`
116116
ip=\`ifconfig \$iface | grep 'inet addr:' | cut -d: -f2 | awk '{ print \$1}'\`
117117
118-
am start \$(am 2>&1 | grep -q '\-\-user' && echo '--user 0') -n com.pdaxrom.cctools/.ADialog \\
118+
am start \$(am 2>&1 | grep -q '\-\-user' && echo '--user 0') -n ${APPLICATION_ID}/.ADialog \\
119119
--es type textview \\
120120
--es title "Dropbear SSH server" \\
121121
--es message "SSH access to CCTools shell: ssh -p 22022 cctools@\${ip}" \\

‎cctools-repo/rules/fpc.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ build_fpc() {
6060
OS_TARGET=linux \
6161
CROSSBINDIR="$crossbindir" \
6262
OPT=$opt \
63-
INSTALL_PREFIX=/data/data/com.pdaxrom.cctools/root/cctools || error "FPC build"
63+
INSTALL_PREFIX=/data/data/${APPLICATION_ID}/root/cctools || error "FPC build"
6464
# PP=fpc
6565

6666
make zipinstall \
6767
CPU_TARGET=$cpu_target \
6868
OS_TARGET=linux \
6969
CROSSBINDIR="$crossbindir" \
7070
OPT=$opt \
71-
INSTALL_PREFIX=/data/data/com.pdaxrom.cctools/root/cctools || error "FPC tgzinstall"
71+
INSTALL_PREFIX=/data/data/${APPLICATION_ID}/root/cctools || error "FPC tgzinstall"
7272
# PP=fpc
7373

7474
error "asd"

‎cctools-repo/rules/native-gcc.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ fi
6464
;;
6565
*86*)
6666
EXTRA_CONF="--disable-libquadmath-support --disable-libcilkrts"
67-
SYSROOT="/data/data/com.pdaxrom.cctools/root/cctools/i686-linux-android"
67+
SYSROOT="/data/data/${APPLICATION_ID}/root/cctools/i686-linux-android"
6868
;;
6969
esac
7070

@@ -121,9 +121,9 @@ fi
121121
$EXTRA_CONF \
122122
|| error "configure"
123123

124-
# --with-as=/data/data/com.pdaxrom.cctools/root/cctools/home/bin/as \
125-
# --with-ld=/data/data/com.pdaxrom.cctools/root/cctools/home/bin/ld \
126-
# --with-nm=/data/data/com.pdaxrom.cctools/root/cctools/home/bin/nm
124+
# --with-as=/data/data/${APPLICATION_ID}/root/cctools/home/bin/as \
125+
# --with-ld=/data/data/${APPLICATION_ID}/root/cctools/home/bin/ld \
126+
# --with-nm=/data/data/${APPLICATION_ID}/root/cctools/home/bin/nm
127127

128128
# --with-binutils-version=$binutils_version \
129129
# --with-mpfr-version=$mpfr_version \

0 commit comments

Comments
 (0)