the default extension for Edje EET files is 'edj' now

SVN revision: 13855
This commit is contained in:
tsauerbeck 2005-03-22 19:29:06 +00:00 committed by tsauerbeck
parent 1da201a836
commit ad5e015627
10 changed files with 28 additions and 28 deletions

View File

@ -55,22 +55,22 @@ Quick start-up guide:
make make
sudo make install sudo make install
You now want to go test it out. first you'll need to make an edje .eet file. You now want to go test it out. first you'll need to make an edje EET file.
cd data cd data
./e_logo.sh ./e_logo.sh
Now you can view the edje you just built: Now you can view the edje you just built:
edje ./e_logo.eet edje ./e_logo.edj
You can view multilpe files at once with the edje test program: You can view multilpe files at once with the edje test program:
edje ./e_logo.eet ./e_logo.eet ./e_logo.eet edje ./e_logo.edj ./e_logo.edj ./e_logo.edj
to view the same one 3 times. to view the same one 3 times.
You can read the source fuile that builds the edje .eet file by looking at: You can read the source fuile that builds the edje EET file by looking at:
data/src/e_logo.edc data/src/e_logo.edc

View File

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
exec edje_cc -v -fd ./test/fonts -id ./images src/e_logo.edc e_logo.eet exec edje_cc -v -fd ./test/fonts -id ./images src/e_logo.edc e_logo.edj

View File

@ -1,13 +1,13 @@
#!/bin/sh -e #!/bin/sh -e
THEME="default" THEME="default"
APPNAME="" APPNAME=""
edje_cc -v -id ./images -fd ./fonts $THEME.edc $THEME.eet edje_cc -v -id ./images -fd ./fonts $THEME.edc $THEME.edj
if [ $? = "0" ]; then if [ $? = "0" ]; then
if [ "$APPNAME" = "" ]; then if [ "$APPNAME" = "" ]; then
echo "Build was successful" echo "Build was successful"
else else
PREFIX=`dirname \`which $APPNAME\` | sed 's/bin//'` PREFIX=`dirname \`which $APPNAME\` | sed 's/bin//'`
sudo cp $THEME.eet $PREFIX"share/$APPNAME/themes/" sudo cp $THEME.edj $PREFIX"share/$APPNAME/themes/"
echo -n "Installed theme to " echo -n "Installed theme to "
echo $PREFIX"share/$APPNAME/themes/" echo $PREFIX"share/$APPNAME/themes/"
fi fi

View File

@ -28,7 +28,7 @@ main_help(void)
{ {
printf printf
("Usage:\n" ("Usage:\n"
"\t%s [OPTIONS] input_file.edc [output_file.eet]\n" "\t%s [OPTIONS] input_file.edc [output_file.edj]\n"
"\n" "\n"
"Where OPTIONS is one or more of:\n" "Where OPTIONS is one or more of:\n"
"\n" "\n"
@ -168,7 +168,7 @@ main(int argc, char **argv)
if (file_out) if (file_out)
{ {
suffix = strstr(file_out,".edc"); suffix = strstr(file_out,".edc");
strcpy(suffix,".eet"); strcpy(suffix,".edj");
} }
} }
} }

View File

@ -31,7 +31,7 @@ main_help(void)
{ {
printf printf
("Usage:\n" ("Usage:\n"
"\t%s input_file.eet \n" "\t%s input_file.edj \n"
"\n" "\n"
,progname); ,progname);
} }
@ -282,7 +282,7 @@ output(void)
} }
f = fopen(out, "w"); f = fopen(out, "w");
fprintf(f, "#!/bin/sh\n"); fprintf(f, "#!/bin/sh\n");
fprintf(f, "%s $@ --image_dir . --font_dir . %s -o %s.eet\n", edje_file->compiler, sf->name, outdir); fprintf(f, "%s $@ --image_dir . --font_dir . %s -o %s.edj\n", edje_file->compiler, sf->name, outdir);
fclose(f); fclose(f);
#ifndef WIN32 #ifndef WIN32

View File

@ -11,7 +11,7 @@ static void
main_help(void) main_help(void)
{ {
printf("Usage: " printf("Usage: "
"%s [OPTIONS] input_file.eet ...\n" "%s [OPTIONS] input_file.edj ...\n"
"\t-o outfile.txt Output the listing of the collections to a file\n" "\t-o outfile.txt Output the listing of the collections to a file\n"
, progname); , progname);
} }

View File

@ -826,9 +826,9 @@ main(int argc, char **argv)
printf(" %s [-gl] [-fb] [-g WxH] [-fill] [edje_file1] [edje_file2] ...\n", argv[0]); printf(" %s [-gl] [-fb] [-g WxH] [-fill] [edje_file1] [edje_file2] ...\n", argv[0]);
printf("\n"); printf("\n");
printf("Example:\n"); printf("Example:\n");
printf(" %s data/e_logo.eet\n", argv[0]); printf(" %s data/e_logo.edj\n", argv[0]);
printf(" %s -fill -g 800x600 data/e_logo.eet\n", argv[0]); printf(" %s -fill -g 800x600 data/e_logo.edj\n", argv[0]);
printf(" %s -gl -fill -g 800x600 data/e_logo.eet\n", argv[0]); printf(" %s -gl -fill -g 800x600 data/e_logo.edj\n", argv[0]);
exit(-1); exit(-1);
} }
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)

View File

@ -4,7 +4,7 @@ set -e
usage () { usage () {
echo "Usage:" echo "Usage:"
echo " edje_recc [OPTIONS] input_file.eet" echo " edje_recc [OPTIONS] input_file.edj"
echo "" echo ""
echo "Where OPTIONS is one or more of:" echo "Where OPTIONS is one or more of:"
echo "" echo ""
@ -37,7 +37,7 @@ if [ $# -ge 1 ]; then
usage usage
;; ;;
*.eet) *.edj)
IN=$I IN=$I
;; ;;
@ -49,13 +49,13 @@ if [ $# -ge 1 ]; then
fi fi
if [ -z "$IN" ]; then if [ -z "$IN" ]; then
echo "ERROR: NO input file.eet provided!" echo "ERROR: NO input file.edj provided!"
echo "" echo ""
usage; usage;
fi fi
F=`basename $IN` F=`basename $IN`
B=`basename $F .eet` B=`basename $F .edj`
T="./...edje_tmp" T="./...edje_tmp"
rm -rf $T rm -rf $T
mkdir -p $T mkdir -p $T

View File

@ -293,7 +293,7 @@ main(int argc, char **argv)
if (argc != 3) if (argc != 3)
{ {
printf("Usage: eddje_test edje_file.eet part_to_load\n"); printf("Usage: eddje_test edje_file.edj part_to_load\n");
exit(-1); exit(-1);
} }

View File

@ -15,14 +15,14 @@ static int _edje_collection_free_prog_cache_matches_free_cb(Evas_Hash *hash, co
/************************** API Routines **************************/ /************************** API Routines **************************/
/* FIXDOC: Verify/expand doc */ /* FIXDOC: Verify/expand doc */
/** Sets the .eet file to be used /** Sets the EET file to be used
* @param obj A valid Evas_Object handle * @param obj A valid Evas_Object handle
* @param file The path to the .eet file * @param file The path to the EET file
* @param part The group name in the eet * @param part The group name in the Edje
* @return 0 on Error\n * @return 0 on Error\n
* 1 on Success and sets EDJE_LOAD_ERROR_NONE * 1 on Success and sets EDJE_LOAD_ERROR_NONE
* *
* This loads the .eet file and sets up the Edje. * This loads the EET file and sets up the Edje.
*/ */
int int
edje_object_file_set(Evas_Object *obj, const char *file, const char *part) edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
@ -285,12 +285,12 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
} }
/* FIXDOC: Verify/expand doc. */ /* FIXDOC: Verify/expand doc. */
/** Get the .eet location and group for the Evas Object. ?! Assuming eet file /** Get the EET location and group for the Evas Object. ?! Assuming eet file
* @param obj A valid Evas_Object handle * @param obj A valid Evas_Object handle
* @param file The .eet file location pointer * @param file The EET file location pointer
* @param part The eet part pointer * @param part The EET part pointer
* *
* This gets the .eet file location and group for the given Evas_Object. * This gets the EET file location and group for the given Evas_Object.
*/ */
void void
edje_object_file_get(Evas_Object *obj, const char **file, const char **part) edje_object_file_get(Evas_Object *obj, const char **file, const char **part)