mirror of
https://github.com/processing/processing4.git
synced 2026-02-11 17:40:48 +01:00
get external editor working, also only build preproc when new work dir
This commit is contained in:
@@ -188,7 +188,10 @@ public class PdeSketch {
|
||||
// remove any entries that didn't load properly
|
||||
int index = 0;
|
||||
while (index < codeCount) {
|
||||
if (code[index].program == null) {
|
||||
//System.out.println("code is " + code);
|
||||
//System.out.println(index + " " + code[index]);
|
||||
if ((code[index] == null) ||
|
||||
(code[index].program == null)) {
|
||||
//hide(index); // although will this file be hidable?
|
||||
for (int i = index+1; i < codeCount; i++) {
|
||||
code[i-1] = code[i];
|
||||
|
||||
@@ -5,9 +5,10 @@
|
||||
|
||||
if test -d work
|
||||
then
|
||||
echo
|
||||
BUILD_PREPROC=false
|
||||
else
|
||||
echo Setting up directories to build for linux...
|
||||
BUILD_PREPROC=true
|
||||
cp -r ../shared work
|
||||
cp -r ../../lib work/libraries
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
if test -d work
|
||||
then
|
||||
echo
|
||||
BUILD_PREPROC=false
|
||||
else
|
||||
if test -f /sw/bin/cp
|
||||
then
|
||||
@@ -16,6 +16,8 @@ else
|
||||
fi
|
||||
|
||||
echo Setting up directories to build under Mac OS X
|
||||
BUILD_PREPROC=true
|
||||
|
||||
cp -r ../shared work
|
||||
|
||||
cp -r ../../lib work/libraries
|
||||
@@ -79,7 +81,8 @@ cd ../app
|
||||
#echo Removing preproc code so it will regenerate
|
||||
#rm preprocessor/expandedpde.g
|
||||
|
||||
if test -f preprocessor/expandedpde.g
|
||||
if $BUILD_PREPROC
|
||||
#if test -f preprocessor/expandedpde.g
|
||||
then
|
||||
echo
|
||||
else
|
||||
|
||||
@@ -5,8 +5,10 @@
|
||||
|
||||
if test -d work
|
||||
then
|
||||
BUILD_PREPROC=false
|
||||
else
|
||||
echo Setting up directories to build P5...
|
||||
BUILD_PREPROC=true
|
||||
cp -r ../shared work
|
||||
rm -rf work/CVS
|
||||
rm -f work/.DS_Store
|
||||
@@ -87,14 +89,17 @@ zip -rq ../build/windows/work/lib/core.jar processing
|
||||
# back to base processing dir
|
||||
cd ..
|
||||
|
||||
#################### TEMPORARY #####################
|
||||
# set to true to re-enable building the preprocessor
|
||||
if true
|
||||
then
|
||||
#################### TEMPORARY #####################
|
||||
|
||||
### -- BUILD PREPROC ---------------------------------------------
|
||||
|
||||
# i suck at shell scripting
|
||||
#if [ $1 = "preproc" ]
|
||||
#then
|
||||
#BUILD_PREPROC=true
|
||||
#fi
|
||||
|
||||
if $BUILD_PREPROC
|
||||
then
|
||||
|
||||
echo Building PDE for JDK 1.4
|
||||
|
||||
cd app/preprocessor
|
||||
@@ -111,9 +116,7 @@ cd app/preprocessor
|
||||
# back to base processing dir
|
||||
cd ../..
|
||||
|
||||
#################### TEMPORARY #####################
|
||||
fi
|
||||
#################### TEMPORARY #####################
|
||||
|
||||
|
||||
### -- BUILD PDE ------------------------------------------------
|
||||
|
||||
@@ -75,9 +75,9 @@ X macosx is using /Library instead of ~/Library.. get this fixed
|
||||
X domain version wasn't in the stubs.. grr
|
||||
X or maybe it's an int or something?
|
||||
X just use reflection to call the function instead
|
||||
|
||||
_ "use external editor" is broken
|
||||
_ throws exception on load()
|
||||
X "use external editor" is broken
|
||||
X throws exception on load()
|
||||
X make preproc only build once (across osx, windows, linux)
|
||||
|
||||
_ if a data file is in the sketch (not data) folder export breaks
|
||||
_ works fine in the editor, but on export gets a nullpointer ex
|
||||
|
||||
Reference in New Issue
Block a user