Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 134595 | Differences between
and this patch

Collapse All | Expand All

(-)configure.old (-29 / +33 lines)
Lines 60-65 Link Here
60
    echo "  --force-php-install  Force PHP 5 local reinstall"
60
    echo "  --force-php-install  Force PHP 5 local reinstall"
61
    echo "  --ode-cvs            Use ODE CVS version"
61
    echo "  --ode-cvs            Use ODE CVS version"
62
    echo "  --disable-x          Disable X/GL/GLU test (server)"
62
    echo "  --disable-x          Disable X/GL/GLU test (server)"
63
    echo "  --no-download        Disable ode and php5 download"
63
    exit 0
64
    exit 0
64
}
65
}
65
66
Lines 88-99 Link Here
88
	cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/opende co -r UNSTABLE -P raydium/ode
89
	cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/opende co -r UNSTABLE -P raydium/ode
89
	exit_if_error "$?" "CVS server error ? Try manual install (http://ode.org)"
90
	exit_if_error "$?" "CVS server error ? Try manual install (http://ode.org)"
90
    else
91
    else
91
	echo "   Downloading 'stable CVS' version from Raydium website ..."
92
    	if [ $no_download = "true" ]; then
92
	if [ -f "raydium/ode.tar.gz" ]; then
93
    	    if ! [ -f "raydium/ode.tar.gz" ]; then
93
	    rm -f raydium/ode.tar.gz
94
	        exit_if_error "1" "ode.tar.gz must be present in the raydium directory when using --no-download"
95
	    fi
96
        else
97
	    echo "   Downloading 'stable CVS' version from Raydium website ..."
98
	    if [ -f "raydium/ode.tar.gz" ]; then
99
	        rm -f raydium/ode.tar.gz
100
	    fi
101
	    wget -O raydium/ode.tar.gz http://freeway.raydium.org/data/stable_mirrors/ode.tar.gz
102
	    exit_if_error "$?" "Error downloading."
94
	fi
103
	fi
95
	wget -O raydium/ode.tar.gz http://freeway.raydium.org/data/stable_mirrors/ode.tar.gz
96
	exit_if_error "$?" "Error downloading."
97
	
104
	
98
    # uncompress
105
    # uncompress
99
	echo "   Uncompressing ..."
106
	echo "   Uncompressing ..."
Lines 180-188 Link Here
180
    exit_if_error "$?" "xml2-config not found in path. Please install 'libxml2-devel' to compile PHP"
187
    exit_if_error "$?" "xml2-config not found in path. Please install 'libxml2-devel' to compile PHP"
181
188
182
# download
189
# download
183
    echo "   Downloading latest PHP5 ..."
190
    if [ $no_download == "true" ]; then
184
    wget -O raydium/php-latest.tar.gz http://snaps.php.net/php5.2-latest.tar.gz
191
        if ! [ -f "raydium/php-latest.tar.gz" ]; then
185
    exit_if_error "$?" "wget not found, or network error"
192
            exit_if_error "1" "php-latest.tar.gz must be present in the raydium directory when using --no-download"
193
	fi
194
    else
195
        echo "   Downloading latest PHP5 ..."
196
        wget -O raydium/php-latest.tar.gz http://snaps.php.net/php5.2-latest.tar.gz
197
        exit_if_error "$?" "wget not found, or network error"
198
    fi
186
199
187
# uncompress
200
# uncompress
188
    echo "   Uncompressing ..."
201
    echo "   Uncompressing ..."
Lines 228-264 Link Here
228
241
229
####### Main
242
####### Main
230
243
244
245
ode_cvs="false"
246
disable_x="no"
247
force_ode="false"
248
force_php="false"
249
no_download="false"
250
231
for i in "$@"; do
251
for i in "$@"; do
232
    if [ $i = "--help" ]; then
252
    if [ $i = "--help" ]; then
233
	usage_print
253
	usage_print
234
    fi
254
    fi
235
done
236
237
ode_cvs="false"
238
for i in "$@"; do
239
    if [ $i = "--ode-cvs" ]; then
255
    if [ $i = "--ode-cvs" ]; then
240
	ode_cvs="true"
256
        ode_cvs="true"
241
    fi
257
    fi
242
done
243
244
disable_x="no"
245
for i in "$@"; do
246
    if [ $i = "--disable-x" ]; then
258
    if [ $i = "--disable-x" ]; then
247
	disable_x="yes"
259
        disable_x="yes"
248
    fi
260
    fi
249
done
250
251
force_ode="false"
252
for i in "$@"; do
253
    if [ $i = "--force-ode-install" ]; then
261
    if [ $i = "--force-ode-install" ]; then
254
	force_ode="true"
262
        force_ode="true"
255
    fi
263
    fi
256
done
264
    if [ $i = "--no-download" ]; then
257
265
    	no_download="true"
258
force_php="false"
259
for i in "$@"; do
260
    if [ $i = "--force-php-install" ]; then
261
	force_php="true"
262
    fi
266
    fi
263
done
267
done
264
268

Return to bug 134595