mirror of
https://github.com/processing/processing4.git
synced 2026-06-16 04:26:26 +02:00
removing ifdefs, fixing build scripts
This commit is contained in:
@@ -2,27 +2,27 @@
|
||||
|
||||
|
||||
# move to base 'processing' directory
|
||||
cd ../..
|
||||
#cd ../..
|
||||
|
||||
|
||||
### -- CHECK TO MAKE SURE BAGEL EXISTS -------------------------
|
||||
|
||||
# make sure bagel exists, if not, check it out of cvs
|
||||
if test -d bagel
|
||||
then
|
||||
else
|
||||
echo Doing CVS checkout of bagel...
|
||||
cvs co bagel
|
||||
cd bagel
|
||||
cvs update -P
|
||||
cd ..
|
||||
fi
|
||||
#if test -d bagel
|
||||
#then
|
||||
#else
|
||||
# echo Doing CVS checkout of bagel...
|
||||
# cvs co bagel
|
||||
# cd bagel
|
||||
# cvs update -P
|
||||
# cd ..
|
||||
#fi
|
||||
|
||||
|
||||
### -- SETUP WORK DIR -------------------------------------------
|
||||
|
||||
# back to where we came from
|
||||
cd build/windows
|
||||
#cd build/windows
|
||||
|
||||
if test -d work
|
||||
then
|
||||
@@ -61,82 +61,90 @@ else
|
||||
chmod +x client/*.dll
|
||||
cd ../../..
|
||||
|
||||
mkdir work/lib/export
|
||||
# mkdir work/lib/export
|
||||
mkdir work/lib/build
|
||||
# this will copy cvs files intact, meaning that changes
|
||||
# could be made and checked back in.. interesting
|
||||
mkdir work/classes
|
||||
|
||||
# no longer needed with super-release
|
||||
# no longer needed with megabucket
|
||||
#cp dist/lib/pde_windows.properties work/lib/
|
||||
|
||||
|
||||
echo Compiling processing.exe
|
||||
cd launcher
|
||||
make && cp processing.exe ../work/
|
||||
cd ..
|
||||
|
||||
# get the serial stuff
|
||||
echo Copying serial support from bagel dir...
|
||||
cp ../../bagel/serial/comm.jar work/lib/
|
||||
cp ../../bagel/serial/javax.comm.properties work/lib/
|
||||
cp ../../bagel/serial/win32com.dll work/
|
||||
chmod +x work/win32com.dll
|
||||
# echo Copying serial support from processing.lib dir...
|
||||
# cp ../../lib/serial/comm.jar work/lib/
|
||||
# cp ../../lib/serial/javax.comm.properties work/lib/
|
||||
# cp ../../lib/serial/win32com.dll work/
|
||||
# chmod +x work/win32com.dll
|
||||
|
||||
# get jikes and depedencies
|
||||
#gunzip < dist/jikes.gz > work/jikes.exe
|
||||
cp dist/jikes.exe work/
|
||||
chmod +x work/jikes.exe
|
||||
fi
|
||||
|
||||
cd ../..
|
||||
|
||||
### -- BUILD BAGEL ----------------------------------------------
|
||||
### -- BUILD CORE ----------------------------------------------
|
||||
|
||||
echo Building processing.core
|
||||
|
||||
# move to bagel inside base 'processing' directory
|
||||
cd bagel
|
||||
#cd bagel
|
||||
cd core
|
||||
rm -f processing/core/*.class
|
||||
|
||||
# clear jikespath to avoid problems if it is defined elsewhere
|
||||
unset JIKESPATH
|
||||
#unset JIKESPATH
|
||||
|
||||
QT_JAVA_PATH="$WINDIR\\system32\\QTJava.zip"
|
||||
if test -f "${QT_JAVA_PATH}"
|
||||
then
|
||||
#echo "Found Quicktime at $QT_JAVA_PATH"
|
||||
else
|
||||
QT_JAVA_PATH="$WINDIR\\system\\QTJava.zip"
|
||||
if test -f "${QT_JAVA_PATH}"
|
||||
echo "could not find qtjava.zip in either"
|
||||
echo "${WINDIR}\\system32\\qtjava.zip or"
|
||||
echo "${WINDIR}\\system\\qtjava.zip"
|
||||
echo "quicktime for java must be installed before building."
|
||||
exit 1;
|
||||
then
|
||||
#echo "Found Quicktime at $QT_JAVA_PATH"
|
||||
else
|
||||
fi
|
||||
fi
|
||||
#QT_JAVA_PATH="$WINDIR\\system32\\QTJava.zip"
|
||||
#if test -f "${QT_JAVA_PATH}"
|
||||
#then
|
||||
# #echo "Found Quicktime at $QT_JAVA_PATH"
|
||||
#else
|
||||
# QT_JAVA_PATH="$WINDIR\\system\\QTJava.zip"
|
||||
# if test -f "${QT_JAVA_PATH}"
|
||||
# echo "could not find qtjava.zip in either"
|
||||
# echo "${WINDIR}\\system32\\qtjava.zip or"
|
||||
# echo "${WINDIR}\\system\\qtjava.zip"
|
||||
# echo "quicktime for java must be installed before building."
|
||||
# exit 1;
|
||||
# then
|
||||
# #echo "Found Quicktime at $QT_JAVA_PATH"
|
||||
# else
|
||||
# fi
|
||||
#fi
|
||||
|
||||
# new regular version
|
||||
CLASSPATH="..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\lib\\comm.jar;${QT_JAVA_PATH}"
|
||||
#CLASSPATH="..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\lib\\comm.jar;${QT_JAVA_PATH}"
|
||||
CLASSPATH="..\\build\\windows\\work\\java\\lib\\rt.jar
|
||||
export CLASSPATH
|
||||
|
||||
perl make.pl JIKES=../build/windows/work/jikes JDK13
|
||||
cp classes/*.class ../build/windows/work/classes/
|
||||
../build/windows/work/jikes -d . +D -target 1.1 *.java
|
||||
zip -r0q ../../build/windows/work/lib/core.jar processing
|
||||
|
||||
#perl make.pl JIKES=../build/windows/work/jikes JDK13
|
||||
#cp classes/*.class ../build/windows/work/classes/
|
||||
|
||||
#echo Building export classes for 1.1
|
||||
#rm -f classes/*.class
|
||||
#perl make.pl JIKES=../build/windows/work/jikes
|
||||
#cd classes
|
||||
#zip -0q ../../build/windows/work/lib/export11.jar *.class
|
||||
#cd ..
|
||||
|
||||
#echo Building export classes for 1.3
|
||||
#rm -f classes/*.class
|
||||
#perl make.pl JIKES=../build/windows/work/jikes
|
||||
#cd classes
|
||||
#zip -0q ../../build/windows/work/lib/export13.jar *.class
|
||||
#cd ..
|
||||
|
||||
|
||||
echo Building export classes for 1.1
|
||||
rm -f classes/*.class
|
||||
perl make.pl JIKES=../build/windows/work/jikes
|
||||
cd classes
|
||||
zip -0q ../../build/windows/work/lib/export11.jar *.class
|
||||
cd ..
|
||||
|
||||
echo Building export classes for 1.3
|
||||
rm -f classes/*.class
|
||||
perl make.pl JIKES=../build/windows/work/jikes
|
||||
cd classes
|
||||
zip -0q ../../build/windows/work/lib/export13.jar *.class
|
||||
cd ..
|
||||
|
||||
# back to base processing dir
|
||||
cd ..
|
||||
@@ -173,10 +181,9 @@ fi
|
||||
|
||||
cd app
|
||||
|
||||
CLASSPATH="..\\build\\windows\\work\\classes;..\\build\\windows\\work\\lib\\kjc.jar;..\\build\\windows\\work\\lib\antlr.jar;..\\build\\windows\\work\\lib\\oro.jar;..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\lib\\comm.jar;${QT_JAVA_PATH}"
|
||||
CLASSPATH="..\\build\\windows\\work\\classes;..\\build\\windows\\work\\lib\antlr.jar;..\\build\\windows\\work\\lib\\oro.jar;..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\lib\\comm.jar"
|
||||
|
||||
perl ../bagel/buzz.pl "../build/windows/work/jikes +D -classpath \"$CLASSPATH\" -d \"..\\build\\windows\\work/classes\"" -dJDK13 -dJDK14 *.java jeditsyntax/*.java preprocessor/*.java
|
||||
#perl ../bagel/buzz.pl "javac -classpath \"$CLASSPATH\" -d \"..\\build\\windows\\work/classes\"" -dJDK13 -dJDK14 *.java jeditsyntax/*.java preprocessor/*.java
|
||||
|
||||
cd ../build/windows/work/classes
|
||||
rm -f ../lib/pde.jar
|
||||
|
||||
Reference in New Issue
Block a user