Download as
Browse Code »

Commit bf68e6d36a7b67359e3620b216756fba85a8b09f

Authored by Perry Werneck
1 parent 9c6d259d
Exists in develop

Updating bundle.

Showing 1 changed file with 32 additions and 32 deletions   Show diff stats
win/bundle
  Diff comments   View file @bf68e6d
... ... @@ -46,7 +46,7 @@ GTK_LIBDIR=$(echo $(${PKG_CONFIG} --variable=libdir gtk+-3.0) | sed "s@^C:/@/c/@
46 46 GDK_LOADERS=$(echo $(${PKG_CONFIG} --variable=gdk_pixbuf_binarydir gdk-pixbuf-2.0) | sed -e "s@${GTK_PREFIX}@@g")
47 47  
48 48 buildroot=.build
49   -bindir="${buildroot}${prefix}/bin"
  49 +bindir="${buildroot}${MINGW_PREFIX}/bin"
50 50  
51 51 if [ -z "${WIN_ROOT}" ]; then
52 52 WIN_ROOT="/c/Windows"
... ... @@ -64,8 +64,8 @@ install_bin() {
64 64 SOURCES=$(mktemp)
65 65 REQUIRES=$(mktemp)
66 66  
67   - find "${buildroot}${prefix}" -iname "*.dll" > ${SOURCES}
68   - find "${buildroot}${prefix}" -iname "*.exe" >> ${SOURCES}
  67 + find "${buildroot}" -iname "*.dll" > ${SOURCES}
  68 + find "${buildroot}" -iname "*.exe" >> ${SOURCES}
69 69  
70 70 while read FILENAME
71 71 do
... ... @@ -138,18 +138,18 @@ install_bin() {
138 138  
139 139 if [ ! -e "${bindir}/${FILENAME}" ]; then
140 140  
141   - if [ -e ${prefix}/bin/${FILENAME} ]; then
  141 + if [ -e ${MINGW_PREFIX}/bin/${FILENAME} ]; then
142 142  
143 143 AGAIN=1
144   - cp -v "${prefix}/bin/${FILENAME}" "${bindir}/${FILENAME}"
  144 + cp -v "${MINGW_PREFIX}/bin/${FILENAME}" "${bindir}/${FILENAME}"
145 145 if [ "$?" != "0" ]; then
146 146 exit -1
147 147 fi
148 148  
149   - elif [ -e ${prefix}/lib/${FILENAME} ]; then
  149 + elif [ -e ${MINGW_PREFIX}/lib/${FILENAME} ]; then
150 150  
151 151 AGAIN=1
152   - cp -v "${prefix}/lib/${FILENAME}" "${bindir}/${FILENAME}"
  152 + cp -v "${MINGW_PREFIX}/lib/${FILENAME}" "${bindir}/${FILENAME}"
153 153 if [ "$?" != "0" ]; then
154 154 exit -1
155 155 fi
... ... @@ -160,8 +160,8 @@ install_bin() {
160 160  
161 161 else
162 162  
163   - echo "Can't find ${prefix}/bin/${FILENAME} or ${WIN_ROOT}/System32/${FILENAME}"
164   - find "${prefix}" -iname "${FILENAME}"
  163 + echo "Can't find ${MINGW_PREFIX}/bin/${FILENAME} or ${WIN_ROOT}/System32/${FILENAME}"
  164 + find "${MINGW_PREFIX}" -iname "${FILENAME}"
165 165 exit -1
166 166  
167 167 fi
... ... @@ -179,7 +179,7 @@ install_bin() {
179 179  
180 180 install_locale() {
181 181  
182   - mkdir -p ${buildroot}${prefix}/share/locale/pt_BR/LC_MESSAGES
  182 + mkdir -p ${buildroot}${MINGW_PREFIX}/share/locale/pt_BR/LC_MESSAGES
183 183  
184 184 locales="
185 185 gettext-runtime.mo
... ... @@ -192,7 +192,7 @@ install_locale() {
192 192 FILENAMES=$(mktemp)
193 193 for i in ${locales}
194 194 do
195   - find "${prefix}/share/locale" -name ${i} >> ${FILENAMES}
  195 + find "${MINGW_PREFIX}/share/locale" -name ${i} >> ${FILENAMES}
196 196 done
197 197  
198 198 while read FILENAME
... ... @@ -208,7 +208,7 @@ install_locale() {
208 208  
209 209 install_schemas() {
210 210  
211   - mkdir -p ${buildroot}${prefix}/share/glib-2.0/schemas
  211 + mkdir -p ${buildroot}${MINGW_PREFIX}/share/glib-2.0/schemas
212 212  
213 213 schemas="
214 214 org.gtk.Settings.FileChooser.gschema.xml
... ... @@ -217,15 +217,15 @@ install_schemas() {
217 217  
218 218 for schema in ${schemas}
219 219 do
220   - cp -v "${prefix}/share/glib-2.0/schemas/${schema}" "${buildroot}${prefix}/share/glib-2.0/schemas"
  220 + cp -v "${MINGW_PREFIX}/share/glib-2.0/schemas/${schema}" "${buildroot}${MINGW_PREFIX}/share/glib-2.0/schemas"
221 221 if [ "$?" != "0" ]; then
222 222 exit -1
223 223 fi
224 224 done
225 225  
226 226 glib-compile-schemas \
227   - --targetdir="${buildroot}${prefix}/share/glib-2.0/schemas" \
228   - "${buildroot}${prefix}/share/glib-2.0/schemas"
  227 + --targetdir="${buildroot}${MINGW_PREFIX}/share/glib-2.0/schemas" \
  228 + "${buildroot}${MINGW_PREFIX}/share/glib-2.0/schemas"
229 229  
230 230 if [ "$?" != "0" ]; then
231 231 exit -1
... ... @@ -234,34 +234,34 @@ install_schemas() {
234 234  
235 235 install_theme() {
236 236  
237   - mkdir -p "${buildroot}${prefix}/etc"
238   - cp -rv "${prefix}/etc/gtk-3.0" "${buildroot}${prefix}/etc"
  237 + mkdir -p "${buildroot}${MINGW_PREFIX}/etc"
  238 + cp -rv "${MINGW_PREFIX}/etc/gtk-3.0" "${buildroot}${MINGW_PREFIX}/etc"
239 239 if [ "$?" != "0" ]; then
240 240 exit -1
241 241 fi
242 242  
243 243 # https://stackoverflow.com/questions/37035936/how-to-get-native-windows-decorations-on-gtk3-on-windows-7-and-msys2
244   - mkdir -p ${buildroot}${prefix}/etc/gtk-3.0
245   - rm -f ${buildroot}${prefix}/etc/gtk-3.0/settings.ini
246   - rm -f ${buildroot}${prefix}/etc/gtk-3.0/gtkrc
  244 + mkdir -p ${buildroot}${MINGW_PREFIX}/etc/gtk-3.0
  245 + rm -f ${buildroot}${MINGW_PREFIX}/etc/gtk-3.0/settings.ini
  246 + rm -f ${buildroot}${MINGW_PREFIX}/etc/gtk-3.0/gtkrc
247 247  
248   - echo "[Settings]" > ${buildroot}${prefix}/etc/gtk-3.0/settings.ini
249   - echo "gtk-theme-name=${1}" >> ${buildroot}${prefix}/etc/gtk-3.0/settings.ini
  248 + echo "[Settings]" > ${buildroot}${MINGW_PREFIX}/etc/gtk-3.0/settings.ini
  249 + echo "gtk-theme-name=${1}" >> ${buildroot}${MINGW_PREFIX}/etc/gtk-3.0/settings.ini
250 250  
251 251 if [ -e "${srcdir}/win/gtk.css" ]; then
252   - mkdir -p "${buildroot}${prefix}/share/themes/Default/gtk-3.0"
253   - cp "${srcdir}/win/gtk.css" "${buildroot}${prefix}/share/themes/Default/gtk-3.0/gtk.css"
  252 + mkdir -p "${buildroot}${MINGW_PREFIX}/share/themes/Default/gtk-3.0"
  253 + cp "${srcdir}/win/gtk.css" "${buildroot}${MINGW_PREFIX}/share/themes/Default/gtk-3.0/gtk.css"
254 254 fi
255 255  
256 256 }
257 257  
258 258 install_icons() {
259 259  
260   - mkdir -p "${buildroot}${prefix}/share/icons"
  260 + mkdir -p "${buildroot}${MINGW_PREFIX}/share/icons"
261 261  
262   - if [ -d "${prefix}/share/icons/${1}" ]; then
  262 + if [ -d "${MINGW_PREFIX}/share/icons/${1}" ]; then
263 263  
264   - cp -rv "${prefix}/share/icons/${1}" "${buildroot}${prefix}/share/icons"
  264 + cp -rv "${MINGW_PREFIX}/share/icons/${1}" "${buildroot}${MINGW_PREFIX}/share/icons"
265 265 if [ "$?" != 0 ]; then
266 266 echo "Can´t copy ${1} icons"
267 267 exit -1
... ... @@ -269,7 +269,7 @@ install_icons() {
269 269  
270 270 elif [ -d "/usr/share/icons/${1}" ]; then
271 271  
272   - cp -rv "/usr/share/icons/${1}" "${buildroot}${prefix}/share/icons"
  272 + cp -rv "/usr/share/icons/${1}" "${buildroot}${MINGW_PREFIX}/share/icons"
273 273 if [ "$?" != 0 ]; then
274 274 echo "Can´t copy ${1} icons"
275 275 exit -1
... ... @@ -286,14 +286,14 @@ install_icons() {
286 286  
287 287 install_loaders() {
288 288  
289   - if [ -d "${prefix}${GDK_LOADERS}" ]; then
290   - mkdir -p "${buildroot}/${prefix}${GDK_LOADERS}"
291   - cp -rv ${prefix}${GDK_LOADERS}/* "${buildroot}/${prefix}${GDK_LOADERS}"
  289 + if [ -d "${MINGW_PREFIX}${GDK_LOADERS}" ]; then
  290 + mkdir -p "${buildroot}/${MINGW_PREFIX}${GDK_LOADERS}"
  291 + cp -rv ${MINGW_PREFIX}${GDK_LOADERS}/* "${buildroot}/${MINGW_PREFIX}${GDK_LOADERS}"
292 292 if [ "$?" != "0" ]; then
293 293 exit -1
294 294 fi
295 295  
296   - find ${buildroot}/${prefix}${GDK_LOADERS} -iname "*.a" -exec rm -f {} \;
  296 + find ${buildroot}/${MINGW_PREFIX}${GDK_LOADERS} -iname "*.a" -exec rm -f {} \;
297 297  
298 298 fi
299 299  
... ...