-rwxr-xr-x | scripts/GeneratePackageMake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/GeneratePackageMake b/scripts/GeneratePackageMake index d5ccee5..099d3e8 100755 --- a/scripts/GeneratePackageMake +++ b/scripts/GeneratePackageMake | |||
@@ -93,97 +93,97 @@ endef | |||
93 | # Will contain a list of all non-mt control files | 93 | # Will contain a list of all non-mt control files |
94 | ALLCONTROLFILES= | 94 | ALLCONTROLFILES= |
95 | 95 | ||
96 | # | 96 | # |
97 | # Will contain a list of all packaging targets | 97 | # Will contain a list of all packaging targets |
98 | ALLPACKAGES= | 98 | ALLPACKAGES= |
99 | 99 | ||
100 | # s contains now single space | 100 | # s contains now single space |
101 | s=\$(x) \$(x) | 101 | s=\$(x) \$(x) |
102 | 102 | ||
103 | # | 103 | # |
104 | # for convenience : generate AllTh | 104 | # for convenience : generate AllTh |
105 | ATP=\$(OPIEDIR)/AllThreadedPackages | 105 | ATP=\$(OPIEDIR)/AllThreadedPackages |
106 | 106 | ||
107 | MAKEFILEHEADER | 107 | MAKEFILEHEADER |
108 | 108 | ||
109 | while read k | 109 | while read k |
110 | do | 110 | do |
111 | CDIR="${k#* }" | 111 | CDIR="${k#* }" |
112 | read k | 112 | read k |
113 | BNAME="${k#* }" | 113 | BNAME="${k#* }" |
114 | read k | 114 | read k |
115 | case $k in | 115 | case $k in |
116 | *"ackage:"*) | 116 | *"ackage:"*) |
117 | Pkg="${k#* }" | 117 | Pkg="${k#* }" |
118 | Pkg="${Pkg// }" | 118 | Pkg="${Pkg// }" |
119 | ;; | 119 | ;; |
120 | *"iles:"*) | 120 | *"iles:"*) |
121 | Files="${k/Files:/}" | 121 | Files="${k/Files:/}" |
122 | ;; | 122 | ;; |
123 | esac | 123 | esac |
124 | read k | 124 | read k |
125 | case $k in | 125 | case $k in |
126 | *"ackage:"*) | 126 | *"ackage:"*) |
127 | Pkg="${k#* }" | 127 | Pkg="${k#* }" |
128 | Pkg="${Pkg// }" | 128 | Pkg="${Pkg// }" |
129 | ;; | 129 | ;; |
130 | *"iles:"*) | 130 | *"iles:"*) |
131 | Files="${k/Files:/}" | 131 | Files="${k/Files:/}" |
132 | ;; | 132 | ;; |
133 | esac | 133 | esac |
134 | 134 | ||
135 | cat << HERE | 135 | cat << HERE |
136 | # | 136 | # |
137 | # package $Pkg in ${BNAME} | 137 | # package $Pkg in ${BNAME} |
138 | # | 138 | # |
139 | 139 | ||
140 | package-${Pkg} : \$(OPIEDIR)/Packages/$Pkg | 140 | package-${Pkg} : \$(OPIEDIR)/Packages/$Pkg |
141 | package-${Pkg}-mt : \$(OPIEDIR)/Packages/$Pkg-mt | 141 | package-${Pkg}-mt : \$(ATP) \$(OPIEDIR)/Packages/$Pkg-mt |
142 | 142 | ||
143 | # collect control files and package targets | 143 | # collect control files and package targets |
144 | 144 | ||
145 | ALLCONTROLFILES += ${CDIR}/${BNAME}.control | 145 | ALLCONTROLFILES += ${CDIR}/${BNAME}.control |
146 | ALLPACKAGES += $Pkg | 146 | ALLPACKAGES += $Pkg |
147 | 147 | ||
148 | # to generate -mt control file | 148 | # to generate -mt control file |
149 | \$(OPIEDIR)/${CDIR}/${BNAME}-mt.control : \$(OPIEDIR)/${CDIR}/${BNAME}.control | 149 | \$(OPIEDIR)/${CDIR}/${BNAME}-mt.control : \$(OPIEDIR)/${CDIR}/${BNAME}.control |
150 | \$(GenerateMTControl) | 150 | \$(GenerateMTControl) |
151 | 151 | ||
152 | HERE | 152 | HERE |
153 | 153 | ||
154 | if [ ! -z "${Files}" ] | 154 | if [ ! -z "${Files}" ] |
155 | then | 155 | then |
156 | 156 | ||
157 | cat << HERE | 157 | cat << HERE |
158 | # optimize speed | 158 | # optimize speed |
159 | .phony : \$(wildcard \$(addprefix \$(OPIEDIR)/,${Files})) | 159 | .phony : \$(wildcard \$(addprefix \$(OPIEDIR)/,${Files})) |
160 | 160 | ||
161 | # capture missing files (because not built) | 161 | # capture missing files (because not built) |
162 | \$(OPIEDIR)/Packages/$Pkg \$(OPIEDIR)/Packages/$Pkg-mt \$(SUBSTFILES): \$(wildcard \$(addprefix \$(OPIEDIR)/,${Files})) | 162 | \$(OPIEDIR)/Packages/$Pkg \$(OPIEDIR)/Packages/$Pkg-mt \$(SUBSTFILES): \$(wildcard \$(addprefix \$(OPIEDIR)/,${Files})) |
163 | HERE | 163 | HERE |
164 | 164 | ||
165 | # echo "\$(wildcard \$(addprefix \$(OPIEDIR)/,${Files})) : " | 165 | # echo "\$(wildcard \$(addprefix \$(OPIEDIR)/,${Files})) : " |
166 | 166 | ||
167 | fi | 167 | fi |
168 | 168 | ||
169 | cat << HERE | 169 | cat << HERE |
170 | \$(OPIEDIR)/Packages/$Pkg : \$(OPIEDIR)/${CDIR}/${BNAME}.control | 170 | \$(OPIEDIR)/Packages/$Pkg : \$(OPIEDIR)/${CDIR}/${BNAME}.control |
171 | @\$(call DoPackage,${CDIR},${BNAME},${BNAME},${Pkg}) | 171 | @\$(call DoPackage,${CDIR},${BNAME},${BNAME},${Pkg}) |
172 | \$(OPIEDIR)/Packages/$Pkg-mt : \$(OPIEDIR)/${CDIR}/${BNAME}-mt.control | 172 | \$(OPIEDIR)/Packages/$Pkg-mt : \$(OPIEDIR)/${CDIR}/${BNAME}-mt.control |
173 | @\$(call DoPackage,${CDIR},${BNAME},${BNAME}-mt,${Pkg}-mt) | 173 | @\$(call DoPackage,${CDIR},${BNAME},${BNAME}-mt,${Pkg}-mt) |
174 | 174 | ||
175 | HERE | 175 | HERE |
176 | 176 | ||
177 | done < /tmp/ALL | 177 | done < /tmp/ALL |
178 | 178 | ||
179 | cat << HERE | 179 | cat << HERE |
180 | # | 180 | # |
181 | # regenerate package file if control files are modified | 181 | # regenerate package file if control files are modified |
182 | # | 182 | # |
183 | 183 | ||
184 | Package.make : \$(addprefix \$(OPIEDIR)/,\$(ALLCONTROLFILES)) | 184 | Package.make : \$(addprefix \$(OPIEDIR)/,\$(ALLCONTROLFILES)) |
185 | 185 | ||
186 | # | 186 | # |
187 | # make targets to build packages | 187 | # make targets to build packages |
188 | # needs quicklauncher link in location (because dangling | 188 | # needs quicklauncher link in location (because dangling |
189 | # links are not considered as true files by the wildcard command) | 189 | # links are not considered as true files by the wildcard command) |